cleaned up pimps scaffold