refactor relevant entities