diff --git a/exercise7/wave_2d_parallel.cu b/exercise7/wave_2d_parallel.cu
index dacfefd..ffdf273 100644
--- a/exercise7/wave_2d_parallel.cu
+++ b/exercise7/wave_2d_parallel.cu
@@ -1,12 +1,12 @@
+#include <errno.h>
+#include <inttypes.h>
+#include <math.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-#include <math.h>
-#include <sys/time.h>
 #include <sys/stat.h>
-#include <errno.h>
-#include <inttypes.h>
+#include <sys/time.h>
 
 // TASK: T1
 // Include the cooperative groups library
@@ -14,11 +14,9 @@
 ;
 // END: T1
 
-
 // Convert 'struct timeval' into seconds in double prec. floating point
 #define WALLTIME(t) ((double)(t).tv_sec + 1e-6 * (double)(t).tv_usec)
 
-
 // Option to change numerical precision
 typedef int64_t int_t;
 typedef double real_t;
@@ -36,7 +34,7 @@ int_t
 
 // Wave equation parameters, time step is derived from the space step
 const real_t
-    c  = 1.0,
+    c = 1.0,
     dx = 1.0,
     dy = 1.0;
 real_t
@@ -46,213 +44,182 @@ real_t
 real_t
     *buffers[3] = { NULL, NULL, NULL };
 
-#define U_prv(i,j) buffers[0][((i)+1)*(N+2)+(j)+1]
-#define U(i,j)     buffers[1][((i)+1)*(N+2)+(j)+1]
-#define U_nxt(i,j) buffers[2][((i)+1)*(N+2)+(j)+1]
+#define U_prv(i, j) buffers[0][((i) + 1) * (N + 2) + (j) + 1]
+#define U(i, j) buffers[1][((i) + 1) * (N + 2) + (j) + 1]
+#define U_nxt(i, j) buffers[2][((i) + 1) * (N + 2) + (j) + 1]
 // END: T1b
 
-#define cudaErrorCheck(ans) { gpuAssert((ans), __FILE__, __LINE__); }
-inline void gpuAssert(cudaError_t code, const char *file, int line, bool abort=true)
-{
-    if (code != cudaSuccess) {
-        fprintf(stderr,"GPUassert: %s %s %d\n", cudaGetErrorString(code), file, line);
-        if (abort) exit(code);
-    }
+#define cudaErrorCheck(ans)               \
+  {                                       \
+    gpuAssert((ans), __FILE__, __LINE__); \
+  }
+inline void gpuAssert(cudaError_t code, const char *file, int line, bool abort = true) {
+  if (code != cudaSuccess) {
+    fprintf(stderr, "GPUassert: %s %s %d\n", cudaGetErrorString(code), file, line);
+    if (abort)
+      exit(code);
+  }
 }
 
-
 // Rotate the time step buffers.
-void move_buffer_window ( void )
-{
-    real_t *temp = buffers[0];
-    buffers[0] = buffers[1];
-    buffers[1] = buffers[2];
-    buffers[2] = temp;
+void move_buffer_window(void) {
+  real_t *temp = buffers[0];
+  buffers[0] = buffers[1];
+  buffers[1] = buffers[2];
+  buffers[2] = temp;
 }
 
-
 // Save the present time step in a numbered file under 'data/'
-void domain_save ( int_t step )
-{
-    char filename[256];
+void domain_save(int_t step) {
+  char filename[256];
 
-    // Ensure output directory exists (ignore error if it already exists)
-    if (mkdir("data", 0755) != 0 && errno != EEXIST) {
-        perror("mkdir data");
-        exit(EXIT_FAILURE);
+  // Ensure output directory exists (ignore error if it already exists)
+  if (mkdir("data", 0755) != 0 && errno != EEXIST) {
+    perror("mkdir data");
+    exit(EXIT_FAILURE);
+  }
+
+  snprintf(filename, sizeof(filename), "data/%05" PRId64 ".dat", step);
+
+  FILE *out = fopen(filename, "wb");
+  if (out == NULL) {
+    perror("fopen output file");
+    fprintf(stderr, "Failed to open '%s' for writing.\n", filename);
+    exit(EXIT_FAILURE);
+  }
+
+  for (int_t i = 0; i < M; ++i) {
+    size_t written = fwrite(&U(i, 0), sizeof(real_t), (size_t)N, out);
+    if (written != (size_t)N) {
+      perror("fwrite");
+      fclose(out);
+      exit(EXIT_FAILURE);
     }
+  }
 
-    snprintf(filename, sizeof(filename), "data/%05" PRId64 ".dat", step);
-
-    FILE *out = fopen(filename, "wb");
-    if (out == NULL) {
-        perror("fopen output file");
-        fprintf(stderr, "Failed to open '%s' for writing.\n", filename);
-        exit(EXIT_FAILURE);
-    }
-
-    for ( int_t i = 0; i < M; ++i ) {
-        size_t written = fwrite ( &U(i,0), sizeof(real_t), (size_t)N, out );
-        if ( written != (size_t)N ) {
-            perror("fwrite");
-            fclose(out);
-            exit(EXIT_FAILURE);
-        }
-    }
-
-    if ( fclose(out) != 0 ) {
-        perror("fclose");
-        exit(EXIT_FAILURE);
-    }
+  if (fclose(out) != 0) {
+    perror("fclose");
+    exit(EXIT_FAILURE);
+  }
 }
 
-
 // TASK: T4
 // Get rid of all the memory allocations
-void domain_finalize ( void )
-{
-// BEGIN: T4
-    free ( buffers[0] );
-    free ( buffers[1] );
-    free ( buffers[2] );
-// END: T4
+void domain_finalize(void) {
+  // BEGIN: T4
+  free(buffers[0]);
+  free(buffers[1]);
+  free(buffers[2]);
+  // END: T4
 }
 
-
 // TASK: T6
 // Neumann (reflective) boundary condition
 // BEGIN: T6
-void boundary_condition ( void )
-{
-    for ( int_t i=0; i<M; i++ )
-    {
-        U(i,-1) = U(i,1);
-        U(i,N)  = U(i,N-2);
-    }
-    for ( int_t j=0; j<N; j++ )
-    {
-        U(-1,j) = U(1,j);
-        U(M,j)  = U(M-2,j);
-    }
+void boundary_condition(void) {
+  for (int_t i = 0; i < M; i++) {
+    U(i, -1) = U(i, 1);
+    U(i, N) = U(i, N - 2);
+  }
+  for (int_t j = 0; j < N; j++) {
+    U(-1, j) = U(1, j);
+    U(M, j) = U(M - 2, j);
+  }
 }
 // END: T6
 
-
 // TASK: T5
 // Integration formula
 // BEGIN: T5
-void time_step ( void )
-{
-    for ( int_t i=0; i<M; i++ )
-    {
-        for ( int_t j=0; j<N; j++ )
-        {
-            U_nxt(i,j) = -U_prv(i,j) + 2.0*U(i,j)
-                     + (dt*dt*c*c)/(dx*dy) * (
-                        U(i-1,j)+U(i+1,j)+U(i,j-1)+U(i,j+1)-4.0*U(i,j)
-                     );
-        }
+void time_step(void) {
+  for (int_t i = 0; i < M; i++) {
+    for (int_t j = 0; j < N; j++) {
+      U_nxt(i, j) = -U_prv(i, j) + 2.0 * U(i, j) + (dt * dt * c * c) / (dx * dy) * (U(i - 1, j) + U(i + 1, j) + U(i, j - 1) + U(i, j + 1) - 4.0 * U(i, j));
     }
+  }
 }
 // END: T5
 
-
 // TASK: T7
 // Main time integration.
-void simulate( void )
-{
-// BEGIN: T7
-    // Go through each time step
-    for ( int_t iteration=0; iteration<=max_iteration; iteration++ )
-    {
-        if ( (iteration % snapshot_freq)==0 )
-        {
-            domain_save ( iteration / snapshot_freq );
-        }
-
-        // Derive step t+1 from steps t and t-1
-        boundary_condition();
-        time_step();
-
-        // Rotate the time step buffers
-        move_buffer_window();
+void simulate(void) {
+  // BEGIN: T7
+  // Go through each time step
+  for (int_t iteration = 0; iteration <= max_iteration; iteration++) {
+    if ((iteration % snapshot_freq) == 0) {
+      domain_save(iteration / snapshot_freq);
     }
-// END: T7
-}
 
+    // Derive step t+1 from steps t and t-1
+    boundary_condition();
+    time_step();
+
+    // Rotate the time step buffers
+    move_buffer_window();
+  }
+  // END: T7
+}
 
 // TASK: T8
 // GPU occupancy
-void occupancy( void )
-{
-// BEGIN: T8
-    ;
-// END: T8
+void occupancy(void) {
+  // BEGIN: T8
+  ;
+  // END: T8
 }
 
-
 // TASK: T2
 // Make sure at least one CUDA-capable device exists
-static bool init_cuda()
-{
-// BEGIN: T2
-    return true;
-// END: T2
+static bool init_cuda() {
+  // BEGIN: T2
+  return true;
+  // END: T2
 }
 
-
 // TASK: T3
 // Set up our three buffers, and fill two with an initial perturbation
 // Function to determine occupancy and optimal configuration
 
+void domain_initialize(void) {
+  // BEGIN: T3
+  bool locate_cuda = init_cuda();
+  if (!locate_cuda) {
+    exit(EXIT_FAILURE);
+  }
 
-void domain_initialize ( void )
-{
-// BEGIN: T3
-    bool locate_cuda = init_cuda();
-    if (!locate_cuda)
-    {
-        exit( EXIT_FAILURE );
+  buffers[0] = (real_t *)malloc((M + 2) * (N + 2) * sizeof(real_t));
+  buffers[1] = (real_t *)malloc((M + 2) * (N + 2) * sizeof(real_t));
+  buffers[2] = (real_t *)malloc((M + 2) * (N + 2) * sizeof(real_t));
+
+  for (int_t i = 0; i < M; i++) {
+    for (int_t j = 0; j < N; j++) {
+      // Calculate delta (radial distance) adjusted for M x N grid
+      real_t delta = sqrt(((i - M / 2.0) * (i - M / 2.0)) / (real_t)M +
+                          ((j - N / 2.0) * (j - N / 2.0)) / (real_t)N);
+      U_prv(i, j) = U(i, j) = exp(-4.0 * delta * delta);
     }
+  }
 
-    buffers[0] = (real_t *) malloc ( (M+2)*(N+2)*sizeof(real_t) );
-    buffers[1] = (real_t *) malloc ( (M+2)*(N+2)*sizeof(real_t) );
-    buffers[2] = (real_t *) malloc ( (M+2)*(N+2)*sizeof(real_t) );
-
-    for ( int_t i=0; i<M; i++ )
-    {
-        for ( int_t j=0; j<N; j++ )
-        {
-            // Calculate delta (radial distance) adjusted for M x N grid
-            real_t delta = sqrt ( ((i - M/2.0) * (i - M/2.0)) / (real_t)M +
-                                ((j - N/2.0) * (j - N/2.0)) / (real_t)N );
-            U_prv(i,j) = U(i,j) = exp ( -4.0*delta*delta );
-        }
-    }
-
-    // Set the time step for 2D case
-    dt = dx*dy / (c * sqrt (dx*dx+dy*dy));
+  // Set the time step for 2D case
+  dt = dx * dy / (c * sqrt(dx * dx + dy * dy));
 }
 
+int main(void) {
+  // Set up the initial state of the domain
+  domain_initialize();
 
-int main ( void )
-{
-    // Set up the initial state of the domain
-    domain_initialize();
+  struct timeval t_start, t_end;
 
-    struct timeval t_start, t_end;
+  gettimeofday(&t_start, NULL);
+  simulate();
+  gettimeofday(&t_end, NULL);
 
-    gettimeofday ( &t_start, NULL );
-    simulate();
-    gettimeofday ( &t_end, NULL );
+  printf("Total elapsed time: %lf seconds\n",
+         WALLTIME(t_end) - WALLTIME(t_start));
 
-    printf ( "Total elapsed time: %lf seconds\n",
-        WALLTIME(t_end) - WALLTIME(t_start)
-    );
+  occupancy();
 
-    occupancy();
-
-    // Clean up and shut down
-    domain_finalize();
-    exit ( EXIT_SUCCESS );
+  // Clean up and shut down
+  domain_finalize();
+  exit(EXIT_SUCCESS);
 }