several improvement
refactor naming