Refactor simple MVC