PEP8, lint and some typos