Edited some of the Controller pkg files to meet the checkstyle
requirements