9 more reviewed + pep8 cleaned