Fix for coveralls/travis and formatting tweaks