Add PEP8 checker
Fix PEP8 code style
Fixed merge conflict.