Code Improvement: