Refactor to clear travis