bug #664 - apply fixes: pep8, remove *args