Issue #228/#231: Clean up PEP8 warning on line length