Cleanup, organize new entries