Fixing whitespace
Checkstyle clean up