refactoring according AngularGap