address some PR feedback