proceeded with cleaning up, sorting functions, etc