Clean up + phase one of sort controller