Small cleanup of the mess