Refactoring expansion->set