Refactor sorting methods
Remove unused local
Commenting cleanup
Whitespace cleanup