refactor success flushes