diff --git a/src/BlenderServoAnimation.h b/src/BlenderServoAnimation.h
index 8316932..413ac7f 100644
--- a/src/BlenderServoAnimation.h
+++ b/src/BlenderServoAnimation.h
@@ -1,7 +1,7 @@
 #include "AnimationData.h"
+#include "CommonTypes.h"
 #include "Scene.h"
 #include "ServoManager.h"
-#include "CommonTypes.h"
 #include <Arduino.h>
 #include <stdarg.h>
 
@@ -9,11 +9,11 @@
 #define BlenderServoAnimation_H
 
 using BlenderServoAnimationLibrary::AnimationData;
-using BlenderServoAnimationLibrary::Scene;
-using BlenderServoAnimationLibrary::ServoManager;
 using BlenderServoAnimationLibrary::ModeCallback;
 using BlenderServoAnimationLibrary::PositionCallback;
+using BlenderServoAnimationLibrary::Scene;
 using BlenderServoAnimationLibrary::SceneCallback;
+using BlenderServoAnimationLibrary::ServoManager;
 
 class BlenderServoAnimation {
 
diff --git a/src/CommonTypes.h b/src/CommonTypes.h
index bc7672e..a6802db 100644
--- a/src/CommonTypes.h
+++ b/src/CommonTypes.h
@@ -5,10 +5,10 @@
 
 namespace BlenderServoAnimationLibrary {
 
-typedef void (*ModeCallback)(byte, byte); // Mode callback
-typedef void (*PositionCallback)(byte, int);  // Position callback
-typedef void (*SceneCallback)(byte, byte); // Scene callback
+typedef void (*ModeCallback)(byte, byte);
+typedef void (*PositionCallback)(byte, int);
+typedef void (*SceneCallback)(byte, byte);
 
-} // BlenderServoAnimationLibrary
+} // namespace BlenderServoAnimationLibrary
 
 #endif
diff --git a/src/ServoManager.h b/src/ServoManager.h
index 3f67bb3..e1e92d4 100644
--- a/src/ServoManager.h
+++ b/src/ServoManager.h
@@ -1,7 +1,7 @@
 #include "AnimationData.h"
 #include "Command.h"
-#include "Servo.h"
 #include "CommonTypes.h"
+#include "Servo.h"
 #include <Arduino.h>
 
 #ifndef BlenderServoAnimationLibrary_ServoManager_H