Refactor Angular Controller.
Merge pull request #32 from Duder-onomy/master

Refactor Angular Controller.