This fixes #55. Removed additional some pep8 warnings