Tidying and adding global excludes