Refactored
Modified travis config