Refactor expansion