Improved build files
Increased support library version
Removed some commented out code
Extracted sort order implementation and changed sort order