PEP8 + Headers modifications.