Fix code style issues flagged by checkstyle

h/t maxme