cleanup; renaming for better presentation on github