minimal cleanup and editing