Refactor
Adding travis