Cleaned the Controller