some refactoring; angular version bump