and then you can remove this if-block.

I find this more readable.