Cleaned up pins scaffold chyeh