Readability and travis fixes
100% test coverage