Cleaned up the Pins scaffold