Change formatting to comply with rules discussed in #161