PEP8 and a few comments