Refactored more angular