Fix PEP8
Fixes and improvements from Closure compiler.