Cleanup code
Add CI scripts
Merge pull request #3 from ibuildthecloud/refactor

Refactor