Code cleanup / AngularJS 1.2.0 updates