improve style based on checkstyle feedback