Help: more cleanup and editing