misc code style improvements, mainly pep8
six not being used.
Merge pull request #100 from lxyu/misc_code_improvements

Misc code improvements