cleaned up many a thing