add pep 8 formatting and extra fields