Updating code formatting to clean up lingering inconsistencies