More sorting, formatting