* refactor: corrects eslint and variable namespacing * chore: fixes git conflict * chore: fixes eslint