Further sort namespace cleanup