Some very minor cleanup