refactor: remove redundant code
refactor: variable name casing