Refactors and fixes order of yodo input