Abstracted a couple methods to classes.