cleaned-up a couple refs