Refactoring and added Angular