Modified: Tidy of code.
Merge pull request #14 from futoase/feature/tidy-code

Modified: Tidy of code.