Agreed, I found myself getting confused sometimes. I like your solution: it's simple and I'd only have to change one line :D
Thank you for the feedback!
