minor changes
rework naming conventions