Refine some code
28 files changed