little changes to the big fix, #checkstyle