Cleanup and finishing MVC framework