PEP8 and some more comments