Minor cleanups
Sort using