control flow readability
Merge pull request #52 from mlloreda/readability

control flow readability