Fixed typo and pep8

Change-Id: I03b956cbdb295508051230bc2fc3f8d3dc392205