small refactor
small refactor
refactor relation