diff --git a/zecsy.hpp b/zecsy.hpp
index 726f1ff..6765741 100644
--- a/zecsy.hpp
+++ b/zecsy.hpp
@@ -86,9 +86,10 @@ namespace zecsy
 
     private:
         using comp_id = size_t;
-        using zecsy_bits = std::bitset<ZECSY_MAX_COMPONENTS>;
+        using entity_group = std::set<entity_id>;
+        using archetype_signature = std::bitset<ZECSY_MAX_COMPONENTS>;
 
-        std::unordered_map<entity_id, zecsy_bits> entity_to_comps;
+        std::unordered_map<entity_id, archetype_signature> entity_to_comps;
         entity_id entity_counter = 0;
 
         size_t query_archetypes_checked = 0;
@@ -102,10 +103,6 @@ namespace zecsy
         };
 
         std::unordered_map<comp_id, component_pool> pools;
-
-        using archetype_signature = zecsy_bits;
-        using entity_group = std::set<entity_id>;
-
         std::unordered_map<archetype_signature, entity_group> archetypes;
 
         template<Component T>