Tidying up Travis script