Cleaned up Pins Scaffold