r20: Minor fixes to achieve PEP8 compatibility and 100% code coverage