cleaned up converter