Cosmetic fixes and removed the controller code from here