code clean-up and first import
Merge pull request #1 from filip-vt/master

code clean-up and first import