more cleanup edits