coding standards and else block simplification
Merge pull request #1396 from dereuromark/master-cs-else-block

coding standards and else block simplification