Solution: Improving The Code