refactor owner