diff --git a/JokeList/View.php b/JokeList/View.php
index b26b30c..cb83fde 100644
--- a/JokeList/View.php
+++ b/JokeList/View.php
@@ -20,7 +20,7 @@ public function output(\JokeSite\JokeList  $model): string {
 		foreach ($model->getJokes() as $joke) {
 			$output .= '<li>' . $joke['text'];
 
-			$output .= ' <a href="index.php?edit=delete&amp;id=' . $joke['id'] . '">Edit</a>';
+			$output .= ' <a href="index.php?route=edit&amp;id=' . $joke['id'] . '">Edit</a>';
 			$output .= '<form action="index.php?route=delete" method="POST">
 						<input type="hidden" name="id" value="' . $joke['id'] . '" />
 						<input type="submit" value="Delete" />
diff --git a/Model/JokeList.php b/Model/JokeList.php
index c848670..bf0c2ef 100644
--- a/Model/JokeList.php
+++ b/Model/JokeList.php
@@ -1,35 +1,32 @@
 <?php
 namespace JokeSite;
 class JokeList {
+	/* database connection */
 	private $pdo;
+	/* sort method */
 	private $sort = 'oldest';
+	/* search keywork if set */
 	private $keyword;
 
-	public function __construct(\PDO $pdo) {
+	public function __construct(\PDO $pdo, string $sort = 'oldest', string $keyword = '') {
 		$this->pdo = $pdo;
+		$this->sort = $sort;
+		$this->keyword = $keyword;
 	}
 
 	public function sort($dir): self {
-		$model = clone $this;
-		$model->sort = $dir;
-		return $model;
+		return new self($this->pdo, $dir, $this->keyword);
 	}
 
-
-	public function search($keyword) {
-		$model = clone $this;
-
-		$model->keyword = $keyword;
-
-		return $model;
-
+	public function search($keyword): self {
+		return new self($this->pdo, $this->sort, $keyword);
 	}
 
-	public function getKeyword() {
+	public function getKeyword(): string {
 		return $this->keyword;
 	}
 
-	public function getSort() {
+	public function getSort(): string {
 		return $this->sort;
 	}
 
@@ -40,7 +37,7 @@ public function delete($id): self {
 		return $this;
 	}
 
-	public function getJokes() {
+	public function getJokes(): array {
 		$parameters = [];
 
 		if ($this->sort == 'newest') {
diff --git a/public/index.php b/public/index.php
index 26e91e1..6638e58 100644
--- a/public/index.php
+++ b/public/index.php
@@ -17,7 +17,7 @@
 	$model = new \JokeSite\JokeList($pdo);
 	$view = new \JokeList\View();
 }
-if ($route == 'edit') {
+else if ($route == 'edit') {
 	$model = new \JokeSite\JokeForm($pdo);
 	$controller = new \JokeForm\Controller();