arrange the code and give some comment
Merge branch 'remote_et'