Small cleanup!