Cleaned up Controller.
Reformatted Controller