refactor 9