refactor code
Merge pull request #83 from oorion/refactor_code

refactor code