Huge refactor of controller using underscorejs
Added some comments and tiny refactors