Added locale and cleaned up the code a bit