clean + angularjs added