structure MVC done, need to improve it