Make better sorting