Remove empty lines while sorting
Fixed cleanup ordering issue