Minor cleanup
More localization