Small cleanup changes