diff --git a/architecture.py b/architecture.py
index 6549e1c..25c74f0 100644
--- a/architecture.py
+++ b/architecture.py
@@ -4,9 +4,11 @@ import arguments
 import distribution
 import subsystem
 
+MAIN = 'x86_64'
+
 ARCHITECTURES = {
-    'x86_64': (64, [subsystem.MAIN, 'clang64', 'mingw64', 'ucrt64']),
-    'i686':   (32, [subsystem.MAIN, 'clang32', 'mingw32']),
+    MAIN:   (64, [subsystem.MAIN, 'clang64', 'mingw64', 'ucrt64']),
+    'i686': (32, [subsystem.MAIN, 'clang32', 'mingw32']),
 }
 
 
diff --git a/arguments.py b/arguments.py
index e1d4230..8f41486 100644
--- a/arguments.py
+++ b/arguments.py
@@ -76,7 +76,7 @@ compression applying to archive
         action='info',
 
         remote=msys.REPOSITORY,
-        architectures=[msys.ARCHITECTURE],
+        architectures=[architecture.MAIN],
         subsystems=[subsystem.MAIN, 'mingw'],
 
         filesystem='fs',
diff --git a/msys.py b/msys.py
index 76749bb..8ebbe8c 100644
--- a/msys.py
+++ b/msys.py
@@ -1,5 +1,4 @@
 ARCHIVE = '.tar.xz'
-ARCHITECTURE = 'x86_64'
 CATALOG = '.files'
 CHARSET = 'u8'
 REPOSITORY = 'https://repo.msys2.org'