Cleaned code and refactoring
Merge pull request #10 from lap82/DS-1252-bte

Cleaned code and refactoring