Cleaned up pins scafold and there design