PEP8 fixing comments and code reformating