#163 Replace sorting by ordering array on initialization