Code cleanup w/ Comparable and enums