PEP8 fixes and double-spaces removed.