pep8 guided cleanup
fix subtype annotation of results, amend default subtypes