Improvement code

Improvement code