pep8 changes, added default values for some keys