Reorganized, sort and clean-up