refactor 10