No yoda conditions

Thanks to @GrahamCampbell and @lucasmichot to teach me to not use Yoda conditions.