Refactor: better names.