diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp
index b7f2beda3..6693f7e6c 100644
--- a/src/libcalamares/partition/PartitionQuery.cpp
+++ b/src/libcalamares/partition/PartitionQuery.cpp
@@ -58,8 +58,10 @@ findPartitionByCurrentMountPoint( const QList< Device* >& devices, const QString
 {
     for ( auto device : devices )
         for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
-            if ( (*it)->mountPoint() == mountPoint )
+            if ( ( *it )->mountPoint() == mountPoint )
+            {
                 return *it;
+            }
     return nullptr;
 }
 
@@ -68,28 +70,33 @@ Partition*
 findPartitionByPath( const QList< Device* >& devices, const QString& path )
 {
     if ( path.simplified().isEmpty() )
+    {
         return nullptr;
+    }
 
     for ( auto device : devices )
         for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
             if ( ( *it )->partitionPath() == path.simplified() )
+            {
                 return *it;
+            }
     return nullptr;
 }
 
 
 QList< Partition* >
-findPartitions( const QList< Device* >& devices,
-                std::function< bool ( Partition* ) > criterionFunction )
+findPartitions( const QList< Device* >& devices, std::function< bool( Partition* ) > criterionFunction )
 {
     QList< Partition* > results;
     for ( auto device : devices )
         for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
             if ( criterionFunction( *it ) )
+            {
                 results.append( *it );
+            }
     return results;
 }
 
 
-}
-} // namespace
+}  // namespace Partition
+}  // namespace CalamaresUtils
diff --git a/src/libcalamares/partition/PartitionQuery.h b/src/libcalamares/partition/PartitionQuery.h
index 14b98c799..cc4eb4a9d 100644
--- a/src/libcalamares/partition/PartitionQuery.h
+++ b/src/libcalamares/partition/PartitionQuery.h
@@ -33,38 +33,42 @@ namespace CalamaresUtils
 {
 namespace Partition
 {
+
+using ::Device;
+using ::Partition;
+
 /** @brief Is this a free-space area? */
-bool isPartitionFreeSpace( ::Partition* );
+bool isPartitionFreeSpace( Partition* );
 
 /** @brief Is this partition newly-to-be-created?
  *
  * Returns true if the partition is planned to be created by the installer as
  * opposed to already existing on the disk.
  */
-bool isPartitionNew( ::Partition* );
+bool isPartitionNew( Partition* );
 
 /**
  * Iterates on all devices and return the first partition which is (already)
  * mounted on @p mountPoint.
  */
-::Partition* findPartitionByCurrentMountPoint( const QList< ::Device* >& devices, const QString& mountPoint );
+Partition* findPartitionByCurrentMountPoint( const QList< Device* >& devices, const QString& mountPoint );
 
 // TODO: add this distinction
-// ::Partition* findPartitionByIntendedMountPoint( const QList< ::Device* >& devices, const QString& mountPoint );
+// Partition* findPartitionByIntendedMountPoint( const QList< Device* >& devices, const QString& mountPoint );
 
 /**
  * Iterates on all devices and partitions and returns a pointer to the Partition object
  * for the given path, or nullptr if a Partition for the given path cannot be found.
  */
-::Partition* findPartitionByPath( const QList< ::Device* >& devices, const QString& path );
+Partition* findPartitionByPath( const QList< Device* >& devices, const QString& path );
 
 /**
  * Iterates on all devices and partitions and returns a list of pointers to the Partition
  * objects that satisfy the conditions defined in the criterion function.
  */
-QList< ::Partition* > findPartitions( const QList< ::Device* >& devices,
-                                    std::function< bool ( ::Partition* ) > criterionFunction );
-}
-}
+QList< Partition* > findPartitions( const QList< Device* >& devices,
+                                    std::function< bool( Partition* ) > criterionFunction );
+}  // namespace Partition
+}  // namespace CalamaresUtils
 
 #endif  // PARTITION_PARTITIONQUERY_H