Minor improvement
Minor improvement
Minor
Merge pull request #331 from VladRassokhin/minor_improvements

Minor code simplifying