Simplified some control flow statements
Merge pull request #281 from thatsIch/controlflow

Simplified some control flow statements