Checkstyle compliance + minor tweak