replay tidy up (#17)