cleaning up code
Merge branch 'master' of https://github.com/ciandt-dev/cylon