Just refactor