Small changes... cleanup and the sorts