Fix issues related to checkstyle compliance