small refactor of named