Tidy up of CI snippets