Cleaned up Pins Scaffold again