misc code style improvements, mainly pep8
six not being used.