Improve code readability
Improve code readability