Checkstyle

Fix some checkstyle errors