Re-arrange entries, remove small tags.