Little clean up on base controller.