checkstyle fixes

fix whitespace, missing braces and JLS ordering issues.