Clean up description
Update Travis
Refactoring