(#112) - simplify the sorting process a bit