updated formatting and organization