renaming for avoiding confusion
some cleanup