diff --git a/include/nigiri/query_generator/generator.h b/include/nigiri/query_generator/generator.h
index 99dc846f..4fbd24c1 100644
--- a/include/nigiri/query_generator/generator.h
+++ b/include/nigiri/query_generator/generator.h
@@ -15,9 +15,9 @@ struct timetable;
 
 namespace nigiri::query_generation {
 
-constexpr static std::uint32_t const kMaxGenAttempts = 10000U;
+constexpr auto const kMaxGenAttempts = 10000U;
 
-constexpr static int const kTimeOfDayWeights[] = {
+constexpr auto const kTimeOfDayWeights = std::array<int, 24>{
     1,  // 01: 00:00 - 01:00
     1,  // 02: 01:00 - 02:00
     1,  // 03: 02:00 - 03:00
@@ -104,8 +104,8 @@ struct generator {
   std::uniform_int_distribution<day_idx_t::value_t> day_d_;
   std::uniform_int_distribution<std::uint32_t> start_mode_range_d_;
   std::uniform_int_distribution<std::uint32_t> dest_mode_range_d_;
-  std::discrete_distribution<std::uint16_t> hours_d_{
-      std::begin(kTimeOfDayWeights), std::end(kTimeOfDayWeights)};
+  std::discrete_distribution<std::uint16_t> hours_d_{begin(kTimeOfDayWeights),
+                                                     end(kTimeOfDayWeights)};
   std::uniform_int_distribution<std::uint16_t> minutes_d_{0, 59};
   std::uniform_int_distribution<std::uint16_t> bearing_d_{0, 359};
 };
diff --git a/include/nigiri/query_generator/transport_mode.h b/include/nigiri/query_generator/transport_mode.h
index 6b17385b..b03fdf25 100644
--- a/include/nigiri/query_generator/transport_mode.h
+++ b/include/nigiri/query_generator/transport_mode.h
@@ -15,11 +15,11 @@ struct transport_mode {
   std::uint16_t max_duration_;  // [minutes]
 };
 
-constexpr static transport_mode kWalk{
-    .mode_id_ = 1, .speed_ = 50U, .max_duration_ = 15U};
-constexpr static transport_mode kBicycle{
-    .mode_id_ = 2, .speed_ = 200U, .max_duration_ = 15U};
-constexpr static transport_mode kCar{
-    .mode_id_ = 3, .speed_ = 800U, .max_duration_ = 15U};
+constexpr auto const kWalk =
+    transport_mode{.mode_id_ = 1, .speed_ = 50U, .max_duration_ = 15U};
+constexpr auto const kBicycle =
+    transport_mode{.mode_id_ = 2, .speed_ = 200U, .max_duration_ = 15U};
+constexpr auto const kCar =
+    transport_mode{.mode_id_ = 3, .speed_ = 800U, .max_duration_ = 15U};
 
 }  // namespace nigiri::query_generation
\ No newline at end of file