Cleaned up pins scaffold