Improved code locations