still cleaning angularJS codes