Cleaned up controllers.

  - Removed controller dependence on $scope