Apply standard Java style to changes for null handling