Code improvement.