Hi @jzhuo, I've made some more changes. Could you check if you agree with them and if necessary (propose to) change them? Here's a brief overview: