cleaned up conversion