PEP8 fixes, improve comment [MJ-473]