cleaned up the scafold