Refactor code

just refactor
Merge pull request #17 from githubjeka/patch-1

Refactor code