refactor: cleanup variable namespace