Small cleanup pass