Combine almost identical if block

[VincentDamour]

I realized that 2 if block where almost identical. I did a small refactor. I don't know your coding preferences, but to me it looks cleaner. Feel free to merge or decline it if you want.