Improvement code readability

Improvement code readability