fixed more formatting to match master