further pep8 and readability fixes

Change-Id: Ie127cbf8a9eb088609cedcb368031855208c5860