Cleanedup controllers.js