Refactor and include Comparable