Cleaned up & Saving Tasksorting