cleaned up defrecord