cleaned with angular