Merge "Update some descriptions and refine code"