Checkstyle tweaks and fix remaining checkstyle warnings