Dont set @project variable in list. Remove a bit of duplication in dash and group