Some modifications after figuring out how to implement MVC correctly