[MC] refactor, extract saver
[MC] refactor