Cleaned up the controllers to make it more neat