* Small cleanup