#80 minor cleanup