minor fixes related to checkstyle compliance