diff --git a/ex00/Makefile b/ex00/Makefile
index 1154551..be748c8 100644
--- a/ex00/Makefile
+++ b/ex00/Makefile
@@ -16,8 +16,6 @@ main_objs = main.o $(srcs:.cpp=.o)
 all_objs = $(main_objs)
 deps = $(all_objs:.o=.d)
 
-.PHONY: all clean fclean re run
-
 all: $(NAME)
 
 -include $(deps)
@@ -39,6 +37,3 @@ fclean: clean
 re:
 	+make fclean
 	+make all
-
-run: $(NAME)
-	./$(NAME)
diff --git a/ex01/Makefile b/ex01/Makefile
index 4866aa6..6c8c45f 100644
--- a/ex01/Makefile
+++ b/ex01/Makefile
@@ -17,8 +17,6 @@ main_objs = main.o $(srcs:.cpp=.o)
 all_objs = $(main_objs)
 deps = $(all_objs:.o=.d)
 
-.PHONY: all clean fclean re run
-
 all: $(NAME)
 
 -include $(deps)
@@ -40,6 +38,3 @@ fclean: clean
 re:
 	+make fclean
 	+make all
-
-run: $(NAME)
-	./$(NAME)
diff --git a/ex02/Makefile b/ex02/Makefile
index 3f440d3..c2202fe 100644
--- a/ex02/Makefile
+++ b/ex02/Makefile
@@ -18,8 +18,6 @@ main_objs = main.o $(srcs:.cpp=.o)
 all_objs = $(main_objs)
 deps = $(all_objs:.o=.d)
 
-.PHONY: all clean fclean re run
-
 all: $(NAME)
 
 -include $(deps)
@@ -41,6 +39,3 @@ fclean: clean
 re:
 	+make fclean
 	+make all
-
-run: $(NAME)
-	./$(NAME)
diff --git a/ex03/DiamondTrap.cpp b/ex03/DiamondTrap.cpp
index 86209e4..75dd7ff 100644
--- a/ex03/DiamondTrap.cpp
+++ b/ex03/DiamondTrap.cpp
@@ -1,10 +1,12 @@
 #include "DiamondTrap.hpp"
 #include <iostream>
 
-DiamondTrap::DiamondTrap() {
-  hit_points = FragTrap::default_hit_points;
-  energy_points = ScavTrap::default_energy_points;
-  attack_damage = FragTrap::default_attack_damage;
+DiamondTrap::DiamondTrap() : FragTrap(), ScavTrap() {
+  const FragTrap fragtrap = FragTrap();
+
+  hit_points = fragtrap.get_hit_points();
+  energy_points = ScavTrap::energy_points;
+  attack_damage = fragtrap.get_attack_damage();
 
   ClapTrap::name = name + "_clap_name";
   std::cout << "DiamondTrap::DiamondTrap()" << std::endl;
@@ -15,14 +17,15 @@ DiamondTrap::DiamondTrap(const DiamondTrap &other) {
   hit_points = other.hit_points;
   energy_points = other.energy_points;
   attack_damage = other.attack_damage;
-  std::cout << "DiamondTrap::DiamondTrap(const DiamondTrap &other)"
-            << std::endl;
+  std::cout << "DiamondTrap::DiamondTrap(const DiamondTrap &other)" << std::endl;
 }
 
 DiamondTrap::DiamondTrap(std::string name) : name(name) {
-  hit_points = FragTrap::default_hit_points;
-  energy_points = ScavTrap::default_energy_points;
-  attack_damage = FragTrap::default_attack_damage;
+  const FragTrap fragtrap = FragTrap(name);
+
+  hit_points = fragtrap.get_hit_points();
+  energy_points = ScavTrap::energy_points;
+  attack_damage = fragtrap.get_attack_damage();
 
   ClapTrap::name = name + "_clap_name";
   std::cout << "DiamondTrap::DiamondTrap(" << name << ")" << std::endl;
diff --git a/ex03/FragTrap.cpp b/ex03/FragTrap.cpp
index e1bbce7..56a85a1 100644
--- a/ex03/FragTrap.cpp
+++ b/ex03/FragTrap.cpp
@@ -1,15 +1,11 @@
 #include "FragTrap.hpp"
 #include <iostream>
 
-const unsigned int FragTrap::default_hit_points(100);
-const unsigned int FragTrap::default_energy_points(100);
-const unsigned int FragTrap::default_attack_damage(30);
-
 FragTrap::FragTrap() {
   std::cout << "FragTrap::FragTrap()" << std::endl;
-  hit_points = FragTrap::default_hit_points;
-  energy_points = FragTrap::default_energy_points;
-  attack_damage = FragTrap::default_attack_damage;
+  hit_points = 100;
+  energy_points = 100;
+  attack_damage = 30;
 }
 
 FragTrap::FragTrap(const FragTrap &other) {
diff --git a/ex03/FragTrap.hpp b/ex03/FragTrap.hpp
index 06613c2..c942ec3 100644
--- a/ex03/FragTrap.hpp
+++ b/ex03/FragTrap.hpp
@@ -12,11 +12,6 @@ public:
   FragTrap &operator=(const FragTrap &other);
 
   void highFivesGuys();
-
-protected:
-  static const unsigned int default_hit_points;
-  static const unsigned int default_energy_points;
-  static const unsigned int default_attack_damage;
 };
 
 #endif
diff --git a/ex03/Makefile b/ex03/Makefile
index cda03f3..10f3b80 100644
--- a/ex03/Makefile
+++ b/ex03/Makefile
@@ -19,8 +19,6 @@ main_objs = main.o $(srcs:.cpp=.o)
 all_objs = $(main_objs)
 deps = $(all_objs:.o=.d)
 
-.PHONY: all clean fclean re run
-
 all: $(NAME)
 
 -include $(deps)
@@ -42,6 +40,3 @@ fclean: clean
 re:
 	+make fclean
 	+make all
-
-run: $(NAME)
-	./$(NAME)
diff --git a/ex03/ScavTrap.cpp b/ex03/ScavTrap.cpp
index 0c2206c..d2acf91 100644
--- a/ex03/ScavTrap.cpp
+++ b/ex03/ScavTrap.cpp
@@ -1,15 +1,11 @@
 #include "ScavTrap.hpp"
 #include <iostream>
 
-const unsigned int ScavTrap::default_hit_points(100);
-const unsigned int ScavTrap::default_energy_points(50);
-const unsigned int ScavTrap::default_attack_damage(20);
-
 ScavTrap::ScavTrap() {
   std::cout << "ScavTrap::ScavTrap()" << std::endl;
-  hit_points = ScavTrap::default_hit_points;
-  energy_points = ScavTrap::default_energy_points;
-  attack_damage = ScavTrap::default_attack_damage;
+  hit_points = 100;
+  energy_points = 50;
+  attack_damage = 20;
 }
 
 ScavTrap::ScavTrap(const ScavTrap &other) {
diff --git a/ex03/ScavTrap.hpp b/ex03/ScavTrap.hpp
index 593ac1d..f1ecc36 100644
--- a/ex03/ScavTrap.hpp
+++ b/ex03/ScavTrap.hpp
@@ -12,11 +12,6 @@ public:
   ScavTrap &operator=(const ScavTrap &other);
 
   void guardGate();
-
-protected:
-  static const unsigned int default_hit_points;
-  static const unsigned int default_energy_points;
-  static const unsigned int default_attack_damage;
 };
 
 #endif