Translation module upgraded! Now the code seems a lot more neat.