few cleanup edits