Herbalism diff cleanup

Still a bit messy to me