Edited a couple methods to make a bit more sense.