small renaming
code clean up
renaming