PEP8. Incorrect tabbing and some old comments