Small clean-up on pattern functor
Refurbish reverse