refactor 6