Code tidyup. pep-8 friendly