Refactoring Comparable

I think it better