Improving Accuracy and Efficiency of Automatic Software Localization