Cleaned up converter

Cleaned up the converter