Made changes recommended by our CheckstyleFormat.xml