cleanup code, added missing translations