Make Principal and NotPrincipal single items and not lists [GH-3]
Fix pep8 line length