Tidy up CI script