Fixing checkstyle violations