made tweaks and checkstyle changes