refactor
Merge pull request #35 from MiCHiLU/refactor

refactor