Minimal improvements

Hi Tony,

I post small pull request with minimal changes.

Best regards
Oleg