checkstyle, reformating, several fixes