refactor: cleanup variables namespace