Code Cleanup: context menu sorted