General code improvement.