White space removal and PEP8 changes