Enhance my code