diff --git a/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
index 4f68e0ee..890f6294 100644
--- a/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
@@ -55,30 +55,32 @@ public:
     uint8_t   fData[16];
     struct Match
     {
-        const plUUID * fGuid;
-        Match( const plUUID * guid ):fGuid( guid ){}
-        bool operator()( const plUUID * guid ) const { return guid->IsEqualTo( fGuid );}
+        const plUUID* fGuid;
+        Match(const plUUID* guid) : fGuid(guid) {}
+        bool operator()(const plUUID* guid) const { return guid->IsEqualTo(fGuid); }
     };
 
     plUUID();
-    plUUID( const char * s );
-    plUUID( const plString & s );
-    plUUID( const plUUID & other );
-    plUUID( const Uuid & uuid );
-    void    Clear();
-    bool    IsNull() const;
-    bool    IsSet() const { return !IsNull(); }
-    void    CopyFrom( const plUUID * v );
-    void    CopyFrom( const plUUID & v );
-    int     CompareTo( const plUUID * v ) const;
-    bool    IsEqualTo( const plUUID * v ) const;
-    bool    FromString( const char * str );
-    bool    FromString( const plString & str ) { return FromString( str.c_str() ); }
-    bool    ToString( plString & out ) const;
+    plUUID(const plString& s);
+    plUUID(const plUUID& other);
+    plUUID(const Uuid& uuid);
+
+    void     Clear();
+    bool     IsNull() const;
+    bool     IsSet() const { return !IsNull(); }
+    void     CopyFrom(const plUUID* v);
+    void     CopyFrom(const plUUID& v);
+    int      CompareTo(const plUUID* v) const;
+    bool     IsEqualTo(const plUUID* v) const;
+    bool     FromString(const char* str);
+    bool     FromString(const plString& str) { return FromString(str.c_str()); }
+    bool     ToString(plString& out) const;
     plString AsString() const;
-    void    Read( hsStream * s );
-    void    Write( hsStream * s );
-    operator plString ( void ) const { return AsString();}
+    void     Read(hsStream* s);
+    void     Write(hsStream* s);
+
+    operator bool () const { return !IsNull(); }
+    inline bool operator ! () const { return IsNull(); }
 
     bool operator==(const plUUID& other) const {
         return IsEqualTo(&other);
@@ -89,6 +91,7 @@ public:
     bool operator<(const plUUID& other) const {
         return CompareTo(&other) == -1;
     }
+    operator plString (void) const { return AsString(); }
     operator Uuid () const;
 
     static plUUID Generate();