Cleaned Up pins scaffold