minor clean up
minor renaming