Enhance My code