Pep-8 adjustments