Formatting to prepare for PR