ery minor cleanup