Code improvement

Code improvement