Added getName methods to controller and action classes
Reformatted some code