program renaming
a bit of cleanup