Code refactor
Merge pull request #1 from MmKolodziej/code_refactor

Code refactor