Cleaning up Controllers