Refactoring using PeParsey