Formatting fixes for new code