Refactored Angular Controller Calls.