Formatting cleanup.
Removed locale test, as it is unreliable at best.