Revise Name and Refactor Functions

Revise Name and Refactor Functions