diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h
index 7f52cb3a29..af9b5e55d1 100644
--- a/libraries/audio/src/AudioInjector.h
+++ b/libraries/audio/src/AudioInjector.h
@@ -40,7 +40,6 @@ private:
     AudioInjectorOptions _options;
     bool _shouldStop;
     int _currentSendPosition;
-    
 };
 
 Q_DECLARE_METATYPE(AudioInjector*)
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 636096124c..126da654ae 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -625,7 +625,7 @@ int AvatarData::playerCurrentFrame() {
 }
 
 int AvatarData::playerFrameNumber() {
-    return (_player) ? _player->getRecording()->getFrameNumber() : 0;
+    return (_player && _player->getRecording()) ? _player->getRecording()->getFrameNumber() : 0;
 }
 
 void AvatarData::loadRecording(QString filename) {
@@ -722,7 +722,6 @@ void AvatarData::pausePlayer() {
     if (_player) {
         _player->pausePlayer();
     }
-    
 }
 
 void AvatarData::stopPlaying() {
diff --git a/libraries/avatars/src/Player.cpp b/libraries/avatars/src/Player.cpp
index fc1e7269a6..f28b3da547 100644
--- a/libraries/avatars/src/Player.cpp
+++ b/libraries/avatars/src/Player.cpp
@@ -279,7 +279,6 @@ void Player::setCurrentTime(qint64 currentTime) {
                     (float)(currentTime - _recording->getFrameTimestamp(lowestBound)) /
                     (float)(_recording->getFrameTimestamp(highestBound) - _recording->getFrameTimestamp(lowestBound));
         
-        
         if (_recording->getFrameTimestamp(bestGuess) <= currentTime) {
             if (currentTime < _recording->getFrameTimestamp(bestGuess + 1)) {
                 lowestBound = bestGuess;