small modesl refactor