better formatting to reduce merge changes