Some cleanup.
Some cleanup to the angular view.