much refactor
fix typo
trivial fix
fix lable issue
delete trailing whitespace
Merge pull request #35 from sipin/refactor

Refactor