OSTF-211: Review comments applied. PEP8 issues fixed.