Improvements to organism.name formatter