coding standards and else block simplification