Further code-cleanup to fully incorporate angular