cleaned up a few get methods