Cleaned up variables after shifting to a single angular controller.