Further improving the PEP8 compliance and fixing a number of double quote vs single quote issues.