Fommating fixxes, lint and pep8