diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h
index 855d49e51c..654cf4b8fe 100755
--- a/interface/src/Avatar.h
+++ b/interface/src/Avatar.h
@@ -151,10 +151,6 @@ public:
 
     //  Get the position/rotation of a single body ball
     void getBodyBallTransform(AvatarJointID jointID, glm::vec3& position, glm::quat& rotation) const;
-    
-    //read/write avatar data
-    void writeAvatarDataToFile();
-    void readAvatarDataFromFile();
 
     static void renderJointConnectingCone(glm::vec3 position1, glm::vec3 position2, float radius1, float radius2);
 
diff --git a/interface/src/Swatch.cpp b/interface/src/Swatch.cpp
index ad0e3e420a..ea8516e9a8 100644
--- a/interface/src/Swatch.cpp
+++ b/interface/src/Swatch.cpp
@@ -3,8 +3,8 @@
 
 Swatch::Swatch(QAction* action) :
     Tool(action, 0, -1, -1),
-    _selected(1),
-    _textRenderer(MONO_FONT_FAMILY, 10, 100) {
+    _textRenderer(MONO_FONT_FAMILY, 10, 100),
+    _selected(1) {
 }
 
 void Swatch::reset() {
diff --git a/interface/src/Tool.cpp b/interface/src/Tool.cpp
index 3ad5a648e5..ccb42381dd 100644
--- a/interface/src/Tool.cpp
+++ b/interface/src/Tool.cpp
@@ -5,8 +5,8 @@
 #include <QGLWidget>
 
 Tool::Tool(QAction *action, GLuint texture, int x, int y) :
-    _texture(texture),
     _action(action),
+    _texture(texture),
     _x(x),
     _y(y) {
 }
diff --git a/libraries/shared/src/SimpleMovingAverage.cpp b/libraries/shared/src/SimpleMovingAverage.cpp
index df41433618..5a55486216 100644
--- a/libraries/shared/src/SimpleMovingAverage.cpp
+++ b/libraries/shared/src/SimpleMovingAverage.cpp
@@ -22,7 +22,7 @@ int SimpleMovingAverage::updateAverage(float sample) {
     if (_numSamples > 0) {
         _average = (ONE_MINUS_WEIGHTING * _average) + (WEIGHTING * sample);
         
-        float eventDelta = (usecTimestampNow() - _lastEventTimestamp) / 1000000;
+        float eventDelta = (usecTimestampNow() - _lastEventTimestamp) / 1000000.0f;
         
         if (_numSamples > 1) {
             _eventDeltaAverage = (ONE_MINUS_WEIGHTING * _eventDeltaAverage) +
@@ -46,7 +46,7 @@ void SimpleMovingAverage::reset() {
 
 float SimpleMovingAverage::getEventDeltaAverage() {
     return (ONE_MINUS_WEIGHTING * _eventDeltaAverage) +
-        (WEIGHTING * ((usecTimestampNow() - _lastEventTimestamp) / 1000000));
+        (WEIGHTING * ((usecTimestampNow() - _lastEventTimestamp) / 1000000.0f));
 }
 
 float SimpleMovingAverage::getAverageSampleValuePerSecond() {