some cleanup in converter