refactor / respond to cr