Refactor serial vs parallel expansion