PEP8 and hacking compliance

Change-Id: I8854027c486fdf8ee3b2ca1812f5231a50b1014e