diff --git a/exercises/ex2.cpp b/exercises/ex2.cpp
index 9e8cd8e4..337083c3 100644
--- a/exercises/ex2.cpp
+++ b/exercises/ex2.cpp
@@ -7,45 +7,25 @@
 #include <iostream>
 using namespace std;
 
-int main()
-{
-  int week;
+const string week[] = {"Monday", "Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"};
 
-  cout << "Enter week number(1-7): " << endl;
-  cin >> week;
+const int DAY_IN_WEEK = 7;
 
-  if (week == 1)
-  {
-    cout << "Monday" << endl;
-  }
-  else if (week == 2)
-  {
-    cout << "Tuesday" << endl;
-  }
-  else if (week == 3)
-  {
-    cout << "Wednesday" << endl;
-  }
-  else if (week == 4)
-  {
-    cout << "Thursday" << endl;
-  }
-  else if (week == 5)
-  {
-    cout << "Friday" << endl;
-  }
-  else if (week == 6)
-  {
-    cout << "Saturday" << endl;
-  }
-  else if (week == 7)
-  {
-    cout << "Sunday" << endl;
+int main(){
+  int weekDay;
+
+  cout << "Enter weekDay number(1-7): " << endl;
+
+  if(!(cin >> weekDay)){
+    cerr << "Invalid input! Please enter week number between 1-7.";
+    return EXIT_FAILURE;
   }
-  else
-  {
-    cout << "Invalid input! Please enter week number between 1-7." << endl;
+
+  if (weekDay == 0 || weekDay > DAY_IN_WEEK) {
+    cerr << "Invalid input! Please enter week number between 1-7." << endl;
+    return EXIT_FAILURE;
   }
 
-  return 0;
+  cout << week[weekDay-1] << endl;
+  return EXIT_SUCCESS;
 }
\ No newline at end of file