further help formatting and cleanup