simplify ifs
Merge pull request #29 from otaviojava/simplify_if

simplify ifs