clean code
Merge pull request #59 from sealhuang/clean-code

clean code