Updated whitespace and formatting

Replaced remaining usages of IComparable with Comparable
Remove useless IComparable interface