Clean ups and some PEP8 stuff