Converted all sorts to not have a return