Cleaned up the pinss scaffold