Minor tidy, no reason to call out that the id is a uuid.
All fields of an interface are public static and final, don't duplicate this detail.
Drop null checks since its used inconsistently.