Re-address the checkstyle changes.  Last one had the wrong version applied