clean up code

names were changed