Separate condition blocks and fix indentation
Merge pull request #3 from yous/patch-separate-blocks

Separate condition blocks and fix indentation