Refactor Fat Angular Code