Cleanup, organize recent new entries