Just some code refactoring to make the code more clean and readable.

[andreasonny83]

I hope you'll appreciate some code refactoring and code optimisation.

[cheonhyangzhang]

Thanks for the changes for refactoring and code opt.
Sorry that I was focusing another feature #12, forgot this pull request and pushed changes to the master branch which made this pull request out of date.

If you don't mind I will do the refactoring in later changes.

[andreasonny83]

Sure, don't worry. I will have a look at the latest commit and perform a code optimisation according to that.
I made some improvements in my local version you would probably like to have in your repository as well.
I will send you a new pull request soon. :)