Removed Pair class.
More refactoring -- eliminated more getters from classes; using constants instead.