Fixed Travis, refactored