Global code improvement