diff --git a/firmware/controllers/core/efi_wave.cpp b/firmware/controllers/core/efi_wave.cpp
index 0d9e24c032..1b39694d6d 100644
--- a/firmware/controllers/core/efi_wave.cpp
+++ b/firmware/controllers/core/efi_wave.cpp
@@ -32,18 +32,13 @@ void SingleWave::setState(int switchIndex, pin_state_t state) {
 	pinStates[switchIndex] = state;
 }
 
-void MultiWave::baseConstructor() {
+MultiWave::MultiWave() {
 	channels = NULL;
 	switchTimes = NULL;
 	reset();
 }
 
-MultiWave::MultiWave() {
-	baseConstructor();
-}
-
-MultiWave::MultiWave(float *switchTimes, SingleWave *waves) {
-	baseConstructor();
+MultiWave::MultiWave(float *switchTimes, SingleWave *waves) : MultiWave(){
 	init(switchTimes, waves);
 }
 
diff --git a/firmware/controllers/core/efi_wave.h b/firmware/controllers/core/efi_wave.h
index efe7a4ae9e..e94e4df19e 100644
--- a/firmware/controllers/core/efi_wave.h
+++ b/firmware/controllers/core/efi_wave.h
@@ -61,7 +61,6 @@ public:
  */
 class MultiWave {
 public:
-	void baseConstructor();
 	MultiWave();
 	MultiWave(float *switchTimes, SingleWave *waves);
 	void init(float *switchTimes, SingleWave *waves);
diff --git a/firmware/controllers/scheduling/pwm_generator_logic.cpp b/firmware/controllers/scheduling/pwm_generator_logic.cpp
index d73bd84176..be124a96dd 100644
--- a/firmware/controllers/scheduling/pwm_generator_logic.cpp
+++ b/firmware/controllers/scheduling/pwm_generator_logic.cpp
@@ -32,7 +32,7 @@ SimplePwm::SimplePwm(const char *name) : SimplePwm()  {
 	this->name = name;
 }
 
-void PwmConfig::baseConstructor() {
+PwmConfig::PwmConfig() {
 	memset((void*)&scheduling, 0, sizeof(scheduling));
 	memset((void*)&safe, 0, sizeof(safe));
 	dbgNestingLevel = 0;
@@ -46,12 +46,7 @@ void PwmConfig::baseConstructor() {
 	name = "[noname]";
 }
 
-PwmConfig::PwmConfig() {
-	baseConstructor();
-}
-
-PwmConfig::PwmConfig(float *st, SingleWave *waves) {
-	baseConstructor();
+PwmConfig::PwmConfig(float *st, SingleWave *waves) : PwmConfig() {
 	multiWave.init(st, waves);
 }
 
diff --git a/firmware/controllers/scheduling/pwm_generator_logic.h b/firmware/controllers/scheduling/pwm_generator_logic.h
index 93b1003acd..84b89ccdb0 100644
--- a/firmware/controllers/scheduling/pwm_generator_logic.h
+++ b/firmware/controllers/scheduling/pwm_generator_logic.h
@@ -53,7 +53,6 @@ class PwmConfig {
 public:
 	PwmConfig();
 	PwmConfig(float *switchTimes, SingleWave *waves);
-	void baseConstructor();
 	void init(float *switchTimes, SingleWave *waves);
 
 	void weComplexInit(const char *msg,
diff --git a/firmware/util/datalogging.cpp b/firmware/util/datalogging.cpp
index 87dabdcb92..691f1c765d 100644
--- a/firmware/util/datalogging.cpp
+++ b/firmware/util/datalogging.cpp
@@ -295,7 +295,7 @@ void Logging::appendPrintf(const char *fmt, ...) {
 
 #endif /* ! EFI_UNIT_TEST */
 
-void Logging::baseConstructor() {
+Logging::Logging() {
 	name = NULL;
 	buffer = NULL;
 	linePointer = NULL;
@@ -303,12 +303,7 @@ void Logging::baseConstructor() {
 	isInitialized = false;
 }
 
-Logging::Logging() {
-	baseConstructor();
-}
-
-Logging::Logging(char const *name, char *buffer, int bufferSize) {
-	baseConstructor();
+Logging::Logging(char const *name, char *buffer, int bufferSize) : Logging(){
 #if ! EFI_UNIT_TEST
 	initLoggingExt(name, buffer, bufferSize);
 #else
diff --git a/firmware/util/datalogging.h b/firmware/util/datalogging.h
index 20c8431d7e..296aab7c50 100644
--- a/firmware/util/datalogging.h
+++ b/firmware/util/datalogging.h
@@ -18,7 +18,6 @@
 // size of buffers?
 class Logging {
 public:
-	void baseConstructor();
 	Logging();
 	Logging(const char *name, char *buffer, int bufferSize);
 	void initLoggingExt(const char *name, char *buffer, int bufferSize);