Cleaned up Pins Scaffolding