Addresses checkstyle violations