Add Several More Changes to Make the Implementation of Key Features More Elegant