Separate in a better MVC patter