further minor cleanup