Review

 * PEP8 fixes to make it passed
 * Review inline comments
 * A little bit cleanup
review discussion result changes