Refactor code and fix a spelling mistake
Merge pull request #165 from a5anka/refactor

Refactor code and fix a spelling mistake