wip, pep8, code rework