Refactor: better name