Refactoring...
Merge pull request #1 from zahirsolak/sprint1

Refactoring...