-Small cleanup