Improve some expresions of ng-class directives
Fix some refs