Small refactors to improve codebase
Merge branch 'master' of https://github.com/orno/mvc