refactor: helper cleanup