code review fixes
checkstyle fixes