two defs + minor formatting