refactor code
Merge pull request #4 from viktoriastadub/refacor-code

refactor code