Checkstyle violations addressed