fix:#115
cleanup and pep8