Cleaned up the Pins scafold