Minor code cleanup
Merge pull request #1 from khmylov/master

Minor code cleanup