More PEP8 and Google Python Style Guide compliancy changes