Minor cleaning changes