Avoiding extra conditions
Merge pull request #11 from DmitryTsepelev/cleanup

Avoiding extra conditions