Apped and cleaned up Pins Scaffold