Code Simplified After Normalize Endings Included