diff --git a/Homework2/src/compute_arithmetic.cc b/Homework2/src/compute_arithmetic.cc
index 7d42e9a..04d20bf 100644
--- a/Homework2/src/compute_arithmetic.cc
+++ b/Homework2/src/compute_arithmetic.cc
@@ -1,40 +1,21 @@
 #include "compute_arithmetic.hh"
 
 compute_arithmetic::compute_arithmetic()
 {
-    std::cout<<"compute_arithmetic object constructed!"<<std::endl;
+    // std::cout<<"compute_arithmetic object constructed!"<<std::endl;
 }
 
 compute_arithmetic::~compute_arithmetic()
 {
-    std::cout<<"compute_arithmetic object destructed!"<<std::endl;
+    // std::cout<<"compute_arithmetic object destructed!"<<std::endl;
 }
 
-double compute_arithmetic::compute(unsigned int N)
+double compute_arithmetic::expression(unsigned int N)
 {
-    double S = 0.0;
-
-    /*
-    for (int i = 0; i <= N ; i++)
-    {
-        S += double(i);
-    }
-     */
-
-    S= SUM(N);
-
-    return S;
+    return double(N);
 }
 
-
-
-
-
-
-
-
-
-double compute_arithmetic::expression(unsigned int N)
+double compute_arithmetic::compute(unsigned int N)
 {
-    return double(N);
+    return SUM(N);
 }
\ No newline at end of file
diff --git a/Homework2/src/compute_arithmetic.hh b/Homework2/src/compute_arithmetic.hh
index 4421cfb..a911cc9 100644
--- a/Homework2/src/compute_arithmetic.hh
+++ b/Homework2/src/compute_arithmetic.hh
@@ -1,25 +1,18 @@
 #ifndef COMPUTE_ARITHMETIC_HH
 #define COMPUTE_ARITHMETIC_HH
 
 #include "series.hh"
 
 class compute_arithmetic: public Series
 {
 public:
     // Constructor - Destructor
     compute_arithmetic();
     ~compute_arithmetic();
 
     // Functions
-    double compute(unsigned int N);
-
-
-
-
-
-
-
-    double expression(unsigned int N);
+    double expression(unsigned int N);  // Expression appeared in the Sigma for arithmetic
+    double compute(unsigned int N);     // The target function
 };
 
 #endif
\ No newline at end of file
diff --git a/Homework2/src/compute_pi.cc b/Homework2/src/compute_pi.cc
index 80cf5a4..6686a4c 100644
--- a/Homework2/src/compute_pi.cc
+++ b/Homework2/src/compute_pi.cc
@@ -1,47 +1,34 @@
 #include "compute_pi.hh"
 
 compute_pi::compute_pi()
 {
-    std::cout<<"compute_pi object constructed!"<<std::endl;
+    // std::cout<<"compute_pi object constructed!"<<std::endl;
 }
 
 compute_pi::~compute_pi()
 {
-    std::cout<<"compute_pi object destructed!"<<std::endl;
+    // std::cout<<"compute_pi object destructed!"<<std::endl;
 }
 
-double compute_pi::compute(unsigned int N)
+double compute_pi::expression(unsigned int N)
 {
-    double S = 0.0;
-
-    /*
-    if (N != 0)
-    {
-        for (int i = 1; i <= N; i++)
-        {
-            S += 1.0/pow(double(i),2);
-        }
-    }
-    */
-
-    S=sqrt(6.0*SUM(N));
+    return 1.0/pow(double(N),2);
+}
 
-    return S;
+double compute_pi::compute(unsigned int N)
+{
+    return sqrt(6.0*SUM(N));
 }
 
 double compute_pi::getAnalyticPrediction()
 {
     return M_PI;
 }
 
 
 
 
 
 
 
 
-double compute_pi::expression(unsigned int N)
-{
-    return 1.0/pow(double(N),2);
-}
\ No newline at end of file
diff --git a/Homework2/src/compute_pi.hh b/Homework2/src/compute_pi.hh
index 7247342..4bccc05 100644
--- a/Homework2/src/compute_pi.hh
+++ b/Homework2/src/compute_pi.hh
@@ -1,25 +1,19 @@
 #ifndef COMPUTE_PI_HH
 #define COMPUTE_PI_HH
 
 #include "series.hh"
 
 class compute_pi: public Series
 {
 public:
     // Constructor - Destructor
     compute_pi();
     ~compute_pi();
 
     // Functions
-    double compute(unsigned int N);
-    double getAnalyticPrediction();
-
-
-
-
-
-
-    double expression(unsigned int N);
+    double expression(unsigned int N);  // Expression appeared in the Sigma for arithmetic
+    double compute(unsigned int N);     // The target function
+    double getAnalyticPrediction();     // Analytical expected value: pi number
 };
 
 #endif
\ No newline at end of file
diff --git a/Homework2/src/series.cc b/Homework2/src/series.cc
index fa25e8c..0960de4 100644
--- a/Homework2/src/series.cc
+++ b/Homework2/src/series.cc
@@ -1,55 +1,36 @@
-#ifndef SERIES_HH
-#define SERIES_HH
+#include "series.hh"
 
-#include <iostream>
-#include <cmath>
-
-class Series
+Series::Series()
 {
-public:
-    // Constructor - Destructor
-    Series()
-    {
-        std::cout<<"Series object constructed!"<<std::endl;
-        current_index = 0;
-        current_value = 0.0;
-    }
-    virtual ~Series(){std::cout<<"Series object destructed!"<<std::endl;}
-
-    // Functions
-    virtual double compute(unsigned int N) = 0;
-    virtual double getAnalyticPrediction(){return std::nan("");};
-
-    // Members
-    unsigned int current_index;
-    double       current_value;
-
-
-
-
+    //std::cout<<"Series object constructed!"<<std::endl;
+    current_index = 0;
+    current_value = 0.0;
+}
 
+Series::~Series()
+{
+    //std::cout<<"Series object destructed!"<<std::endl;
+}
 
-
-
-    virtual double expression(unsigned int N) = 0;
-
-    double SUM(unsigned int N)
+double Series::SUM(unsigned int N)
+{
+    while (current_index != N)
     {
-        while (current_index != N)
+        if (N>current_index)
+        {
+            current_index += 1;
+            current_value += expression(current_index);
+        }
+        else
         {
-            if (N>current_index)
-            {
-                current_index += 1;
-                current_value += expression(current_index);
-            }
-            else
-            {
-                current_value -= expression(current_index);
-                current_index -= 1;
-            }
+            current_value -= expression(current_index);
+            current_index -= 1;
         }
-        return current_value;
     }
-};
+    return current_value;
+}
 
-#endif
\ No newline at end of file
+double Series::getAnalyticPrediction()
+{
+    return std::nan("");
+}
\ No newline at end of file
diff --git a/Homework2/src/series.hh b/Homework2/src/series.hh
index fa25e8c..c53b192 100644
--- a/Homework2/src/series.hh
+++ b/Homework2/src/series.hh
@@ -1,55 +1,26 @@
 #ifndef SERIES_HH
 #define SERIES_HH
 
 #include <iostream>
 #include <cmath>
 
 class Series
 {
 public:
     // Constructor - Destructor
-    Series()
-    {
-        std::cout<<"Series object constructed!"<<std::endl;
-        current_index = 0;
-        current_value = 0.0;
-    }
-    virtual ~Series(){std::cout<<"Series object destructed!"<<std::endl;}
+    Series();
+    virtual ~Series();
 
     // Functions
-    virtual double compute(unsigned int N) = 0;
-    virtual double getAnalyticPrediction(){return std::nan("");};
-
-    // Members
-    unsigned int current_index;
-    double       current_value;
-
-
-
+    virtual double expression(unsigned int N) = 0;  // The expression appeared in Sigma
+    virtual double compute(unsigned int N) = 0;     // Computes the solution as a function of summation
+    virtual double getAnalyticPrediction();         // Returns analytical asymptotic solution of compute (NaN by default)
+    double SUM(unsigned int N);                     // Sums expression from 1 to N
 
 
-
-
-
-    virtual double expression(unsigned int N) = 0;
-
-    double SUM(unsigned int N)
-    {
-        while (current_index != N)
-        {
-            if (N>current_index)
-            {
-                current_index += 1;
-                current_value += expression(current_index);
-            }
-            else
-            {
-                current_value -= expression(current_index);
-                current_index -= 1;
-            }
-        }
-        return current_value;
-    }
+    // Members
+    unsigned int current_index;                     // Upper bound of the last summation
+    double       current_value;                     // Value of the last summation
 };
 
 #endif
\ No newline at end of file