adjust messaging
fix checkstyle errors