added more translation variables
removed some unneeded code