cleaned up pins scaffold more