Run hacking in a right way

All pep8 issues are resolved

Change-Id: Ie6dbd68e17e69cfe7b974831ab5f532310c8c9f9
Merge "Run hacking in a right way"