Refactoring and implementation of Comparable in Hand