minor cleanup edits