Code and comment cleanup, everything is PEP8