Issue #202 - Minor fixes according to Code reviewer