organization/formatting updates