Redo: Cleaned up the pins scaffold