A couple more changes to formatting