A bunch of tidying based on checkstyle analysis