Refractored more. MVC, yo