Controllers.js cleanup