refactor7