clean code and move OrderBy enum to Utilities