Change format to PEP8 standards (I think)