Replace descriptions with ordered dicts. Cleanup code.