Cleaned up pins Scaffold