Add set/get methods and clean up for 1 degree of separation