checkstlye fixes

Fix all checkstyle violations.