Refactored angular