Improve the readability and update the name