Address Checkstyle violations