Fix code formatting issues with recent changes