Checkstyle violations fix