diff --git a/src/main.cc b/src/main.cc
index 3118f98..67d2909 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -10,14 +10,14 @@
 //==================================================================================================
 
 #include <iostream>
+#include <cfloat>
+
 #include "sphere.h"
 #include "hitable_list.h"
-#include "float.h"
 #include "camera.h"
 #include "material.h"
 #include "random.h"
 
-
 vec3 color(const ray& r, hitable *world, int depth) {
     hit_record rec;
     if (world->hit(r, 0.001, MAXFLOAT, rec)) {
@@ -84,7 +84,11 @@ int main() {
     int nx = 1200;
     int ny = 800;
     int ns = 10;
-    std::cout << "P3\n" << nx << " " << ny << "\n255\n";
+
+    std::cout << "P3\n";
+    std::cout << nx << ' ' << ny << '\n';
+    std::cout << "255\n";
+
     hitable *world = random_scene();
 
     vec3 lookfrom(13,2,3);
@@ -108,7 +112,7 @@ int main() {
             int ir = int(255.99*col[0]);
             int ig = int(255.99*col[1]);
             int ib = int(255.99*col[2]);
-            std::cout << ir << " " << ig << " " << ib << "\n";
+            std::cout << ir << ' ' << ig << ' ' << ib << '\n';
         }
     }
 }
diff --git a/src/vec3.h b/src/vec3.h
index 5d690a2..a3864e5 100644
--- a/src/vec3.h
+++ b/src/vec3.h
@@ -11,11 +11,10 @@
 // with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 //==================================================================================================
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include <iostream>
 
-
 class vec3  {
     public:
         vec3() {}