Refactoring to adhere to better angular standards