code cleanup; https simprints