diff --git a/Display.cpp b/Display.cpp
index 5e605b4..76d2d7c 100644
--- a/Display.cpp
+++ b/Display.cpp
@@ -18,8 +18,25 @@
 
 #include "Display.h"
 #include "Defines.h"
+#include "SerialController.h"
+#include "ModemSerialPort.h"
+#include "NullDisplay.h"
+#include "TFTSerial.h"
+#include "LCDproc.h"
+#include "Nextion.h"
+#include "Conf.h"
+#include "Modem.h"
+#include "UMP.h"
 #include "Log.h"
 
+#if defined(HD44780)
+#include "HD44780.h"
+#endif
+
+#if defined(OLED)
+#include "OLED.h"
+#endif
+
 #include <cstdio>
 #include <cassert>
 #include <cstring>
@@ -432,26 +449,8 @@ void CDisplay::writeNXDNBERInt(float ber)
 }
 
 /* Factory method extracted from MMDVMHost.cpp - BG5HHP */
-#include "SerialController.h"
-#include "ModemSerialPort.h"
-#include "TFTSerial.h"
-#include "LCDproc.h"
-#include "Nextion.h"
-#include "NullDisplay.h"
-
-#include "Conf.h"
-#include "Modem.h"
-#include "UMP.h"
-
-#if defined(HD44780)
-#include "HD44780.h"
-#endif
-
-#if defined(OLED)
-#include "OLED.h"
-#endif
-
-CDisplay* CDisplay::createDisplay(const CConf &conf, CUMP *ump, CModem *modem){
+CDisplay* CDisplay::createDisplay(const CConf& conf, CUMP* ump, CModem* modem)
+{
     CDisplay *display = NULL;
 
     std::string type   = conf.getDisplay();
@@ -601,5 +600,6 @@ CDisplay* CDisplay::createDisplay(const CConf &conf, CUMP *ump, CModem *modem){
 		delete display;
 		display = new CNullDisplay;
 	}
-    return display;
-}
\ No newline at end of file
+
+	return display;
+}
diff --git a/Display.h b/Display.h
index 19af920..8cdaefe 100644
--- a/Display.h
+++ b/Display.h
@@ -76,7 +76,7 @@ public:
 
 	void clock(unsigned int ms);
 
-	static CDisplay* createDisplay(const CConf &conf, CUMP *ump, CModem *modem);
+	static CDisplay* createDisplay(const CConf& conf, CUMP* ump, CModem* modem);
 
 protected:
 	virtual void setIdleInt() = 0;