pep8 improvements + code cleaning