Clean up product and manufacturer names. Closes #44. Closes #47.