some code refactoring
Merge branch 'master' of https://github.com/tyronevergil/MVC.git