Tech Debt: variable name and functions refactor