Formatting fix pre-squash