Code cleanup
Testing code-coverage reporting to coveralls