Small cleanup;