diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index ad9155c7..3359120d 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -29,6 +29,7 @@ set( SAMPLES
      xmpprint.cpp
      xmpsample.cpp
      crwedit.cpp
+     crwparse.cpp
 )
 
 ##
diff --git a/src/crwparse.cpp b/samples/crwparse.cpp
similarity index 68%
rename from src/crwparse.cpp
rename to samples/crwparse.cpp
index c3fdbe7f..ce3fce15 100644
--- a/src/crwparse.cpp
+++ b/samples/crwparse.cpp
@@ -8,8 +8,7 @@
 
 #include <iostream>
 
-int main(int argc, char* const argv[])
-try {
+int main(int argc, char* const argv[]) try {
     if (argc != 2) {
         std::cout << "Usage: " << argv[0] << " file\n";
         std::cout << "Print the CIFF structure of a CRW file\n";
@@ -17,22 +16,24 @@ try {
     }
 
     Exiv2::FileIo io(argv[1]);
-    if(io.open() != 0) {
-        throw Exiv2::Error(kerDataSourceOpenFailed, io.path(), Exiv2::strError());
+    if (io.open() != 0) {
+        throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError());
     }
     Exiv2::IoCloser closer(io);
 
     // Ensure that this is a CRW image
     if (!Exiv2::isCrwType(io, false)) {
-        if (io.error() || io.eof()) throw Exiv2::Error(kerFailedToReadImageData);
-        throw Exiv2::Error(kerNotACrwImage);
+        if (io.error() || io.eof())
+            throw Exiv2::Error(Exiv2::kerFailedToReadImageData);
+        throw Exiv2::Error(Exiv2::kerNotACrwImage);
     }
 
     // Read the image into a memory buffer
     long len = io.size();
     Exiv2::DataBuf buf(len);
     io.read(buf.pData_, len);
-    if (io.error() || io.eof()) throw Exiv2::Error(kerFailedToReadImageData);
+    if (io.error() || io.eof())
+        throw Exiv2::Error(Exiv2::kerFailedToReadImageData);
 
     // Parse the image, starting with a CIFF header component
     Exiv2::Internal::CiffHeader::AutoPtr parseTree(new Exiv2::Internal::CiffHeader);
@@ -40,8 +41,7 @@ try {
     parseTree->print(std::cout);
 
     return 0;
-}
-catch (Exiv2::AnyError& e) {
+} catch (Exiv2::AnyError& e) {
     std::cerr << e << "\n";
     return -1;
 }