fix: variable and function naming, code refactor