pep8: Move comments around

Change-Id: I2433e0e0464abbf68c514b52369cf006ffc868bd
Signed-off-by: Saggi Mizrahi <ficoos@gmail.com>