Refactor Angular app