checkstyle compliance improved