Whitespace and Style fixes & checkstyle config