Checkstyle and code review fixes