Refactoring - towards Controller.js