Replacing one-liner if's
Merge pull request #2 from sovainfo/patch-11

Replacing one-liner if's