Cleaned up Pins scaffold