Added version output check
Initial conversion cleanup