Fix pep8 errors in modules dir

There weren't that many of them - just fix them.

Change-Id: I6aa6d056746c4a6804146b89c12e6313f9d22d9a
Merge "Fix pep8 errors in modules dir"