pep8 and other fintuning