Fixing Checkstyle violations