Clean code
Merge pull request #1 from novapost/cleaning

Clean code