fixme! checkstyle issues
fixup! review comments