Address checkstyle violations