diff --git a/include/simsycl/sycl/device_selector.hh b/include/simsycl/sycl/device_selector.hh
index 8444a7b..f8ad247 100644
--- a/include/simsycl/sycl/device_selector.hh
+++ b/include/simsycl/sycl/device_selector.hh
@@ -6,7 +6,7 @@ namespace simsycl::sycl {
 
 class device_selector {
   public:
-    device_selector(){};
+    device_selector() {}
 
     device_selector(const device_selector &rhs) { (void)rhs; };
 
@@ -15,7 +15,7 @@ class device_selector {
         return *this;
     };
 
-    virtual ~device_selector(){};
+    virtual ~device_selector() {}
 
     device select_device() const { return {}; }
 
diff --git a/include/simsycl/sycl/exception.hh b/include/simsycl/sycl/exception.hh
index 905414a..648b613 100644
--- a/include/simsycl/sycl/exception.hh
+++ b/include/simsycl/sycl/exception.hh
@@ -11,21 +11,21 @@ namespace simsycl::sycl {
 
 class exception : public virtual std::exception {
   public:
-    exception(std::error_code ec, const std::string &what_arg) : m_error(ec, what_arg){};
-    exception(std::error_code ec, const char *what_arg) : m_error(ec, what_arg){};
-    exception(std::error_code ec) : m_error(ec){};
-    exception(int ev, const std::error_category &ecat, const std::string &what_arg) : m_error(ev, ecat, what_arg){};
-    exception(int ev, const std::error_category &ecat, const char *what_arg) : m_error(ev, ecat, what_arg){};
-    exception(int ev, const std::error_category &ecat) : m_error(ev, ecat){};
-
-    exception(context ctx, std::error_code ec, const std::string &what_arg) : m_error(ec, what_arg), m_context(ctx){};
-    exception(context ctx, std::error_code ec, const char *what_arg) : m_error(ec, what_arg), m_context(ctx){};
-    exception(context ctx, std::error_code ec) : m_error(ec), m_context(ctx){};
+    exception(std::error_code ec, const std::string &what_arg) : m_error(ec, what_arg) {}
+    exception(std::error_code ec, const char *what_arg) : m_error(ec, what_arg) {}
+    exception(std::error_code ec) : m_error(ec) {}
+    exception(int ev, const std::error_category &ecat, const std::string &what_arg) : m_error(ev, ecat, what_arg) {}
+    exception(int ev, const std::error_category &ecat, const char *what_arg) : m_error(ev, ecat, what_arg) {}
+    exception(int ev, const std::error_category &ecat) : m_error(ev, ecat) {}
+
+    exception(context ctx, std::error_code ec, const std::string &what_arg) : m_error(ec, what_arg), m_context(ctx) {}
+    exception(context ctx, std::error_code ec, const char *what_arg) : m_error(ec, what_arg), m_context(ctx) {}
+    exception(context ctx, std::error_code ec) : m_error(ec), m_context(ctx) {}
     exception(context ctx, int ev, const std::error_category &ecat, const std::string &what_arg)
-        : m_error(ev, ecat, what_arg), m_context(ctx){};
+        : m_error(ev, ecat, what_arg), m_context(ctx) {}
     exception(context ctx, int ev, const std::error_category &ecat, const char *what_arg)
-        : m_error(ev, ecat, what_arg), m_context(ctx){};
-    exception(context ctx, int ev, const std::error_category &ecat) : m_error(ev, ecat), m_context(ctx){};
+        : m_error(ev, ecat, what_arg), m_context(ctx) {}
+    exception(context ctx, int ev, const std::error_category &ecat) : m_error(ev, ecat), m_context(ctx) {}
 
     const std::error_code &code() const noexcept { return m_error.code(); }
     const std::error_category &category() const noexcept { return m_error.code().category(); }