Further cleanup of the formatting to better display on Github