Small cleanup...