another not in & minor cleanup