diff --git a/MusicBeatDetector/include/MusicBeatDetector/Utils/Data/ShiftRegister.h b/MusicBeatDetector/include/MusicBeatDetector/Utils/Data/ShiftRegister.h
index 0b817ae..d9e70f5 100644
--- a/MusicBeatDetector/include/MusicBeatDetector/Utils/Data/ShiftRegister.h
+++ b/MusicBeatDetector/include/MusicBeatDetector/Utils/Data/ShiftRegister.h
@@ -25,7 +25,7 @@ namespace introlab
         void shift(const T& value);
         const T& operator[](int64_t i) const;
 
-        const std::size_t size() const;
+        std::size_t size() const;
     };
 
     template<class T>
@@ -91,7 +91,7 @@ namespace introlab
     }
 
     template<class T>
-    inline const std::size_t ShiftRegister<T>::size() const
+    inline std::size_t ShiftRegister<T>::size() const
     {
         return m_data.size();
     }
diff --git a/MusicBeatDetector/src/Obtain/BpmEstimator.cpp b/MusicBeatDetector/src/Obtain/BpmEstimator.cpp
index ac744f0..e9e242b 100644
--- a/MusicBeatDetector/src/Obtain/BpmEstimator.cpp
+++ b/MusicBeatDetector/src/Obtain/BpmEstimator.cpp
@@ -16,8 +16,8 @@ BpmEstimator::BpmEstimator(
     float maxBpm,
     size_t candidateCount)
     : m_ossSamplingFrequency(ossSamplingFrequency),
-      m_crossCorrelationCalculator(ossWindowSize),
-      m_candidateCount(candidateCount)
+      m_candidateCount(candidateCount),
+      m_crossCorrelationCalculator(ossWindowSize)
 {
     if (minBpm <= 0 || maxBpm <= 0)
     {
diff --git a/MusicBeatDetector/src/Obtain/OssCalculator.cpp b/MusicBeatDetector/src/Obtain/OssCalculator.cpp
index 7b27c8e..9618075 100644
--- a/MusicBeatDetector/src/Obtain/OssCalculator.cpp
+++ b/MusicBeatDetector/src/Obtain/OssCalculator.cpp
@@ -74,7 +74,7 @@ float OssCalculator::calculateFlux()
 float OssCalculator::calculateOss()
 {
     float oss = 0;
-    for (int64_t i = 0; i < m_fluxShiftRegister.size(); i++)
+    for (size_t i = 0; i < m_fluxShiftRegister.size(); i++)
     {
         oss += m_fluxShiftRegister[i] * m_fluxHamming(i);
     }