Refactoring converters.
Merge pull request #160 from methane/refactoring-converters

Refactoring converters.