Refactoring Comparable
Merge pull request #2128 from mirichi/refactoring-comparable

Refactoring Comparable