Cleaned up the pins scafold