Controller Cleanup 2