more cleanup/editing