Fix plotting ynodes
Merge and if statements in 1 line