round 2 on cleaning up the pins scaffold