code cleanup

Change-Id: Ic4965b4b7efa6a90a682dcac7c4b419781419408
Using StandardLib.sort() instead of AsyncSort.sortImmediately()

Change-Id: I63702e3ab3afb622d436a4a93842de20b7275c9a