Cleaned up the pins scaffold