More refactor

[wangshengjia]

No description provided.

[codecov-io]

Current coverage is 77.24%

Merging #41 into develop will increase coverage by +1.80% as of a518dbd

@@            develop     #41   diff @@
=======================================
  Files             9      10     +1
  Stmts           668     690    +22
  Branches          0       0       
  Methods                           
=======================================
+ Hit             504     533    +29
  Partial           0       0       
+ Missed          164     157     -7

Review entire Coverage Diff as of a518dbd

Powered by Codecov. Updated on successful CI builds.