Improving code
Fix failed merge