diff --git a/main.cpp b/main.cpp
index 781dfc7..4581894 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,7 +3,7 @@
 
 int main()
 {
-    cout<<"Hi, please enter two whole numbers: ";
+    std::cout<<"Hi, please enter two whole numbers: ";
 
     int x,y;
 
@@ -11,8 +11,8 @@ int main()
     std::cout << "Addition: " << x + y << std::endl;
     std::cout << "Subtraction: " << x - y << std::endl;
     std::cout << "Multiplication: " <<x * y << std::endl;
-    std::cout << "Division: " << x / y << std::endl;
-    std::cout << "Remainder: " <<x % y << std::endl;
+    std::cout << "Division: " << (y != 0 ? std::to_string(x / y) : ("Dividing by zero is not a number.")) << std::endl;
+    std::cout << "Remainder: " << (y != 0 ? std::to_string(x % y) : ("Dividing by zero is not a number.")) << std::endl;
     std::cout << "Square Root: " << sqrt(x) << std::endl;
     std::cout << "Square: " << pow(x, y) << std::endl;