minor organization and formatting changes