Some code clean-up
Fix for bugzid 3443
Merge pull request #85 from maksimov/develop

Some code clean-up