Fix #32, clean pep8 coding style issues