diff --git a/Models/Contact.cs b/Models/Contact.cs
index 58e3446..3f8cfdd 100644
--- a/Models/Contact.cs
+++ b/Models/Contact.cs
@@ -6,9 +6,9 @@ public class Contact
 {
 #region Properties
     public int ContactID { get; set; }
-    public string Firstname { get; set; }
-    public string Lastname { get; set; }
-    public string PhoneNumber { get; set; }
+    public string? Firstname { get; set; }
+    public string? Lastname { get; set; }
+    public string? PhoneNumber { get; set; }
     public DateTime DateCreated { get; set; }
     public int UserID  { get; set; }
 #endregion
diff --git a/Models/Text.cs b/Models/Text.cs
index 35c0d9e..8a5e8b0 100644
--- a/Models/Text.cs
+++ b/Models/Text.cs
@@ -6,8 +6,8 @@ public class Text
 {
 #region Properties
     public int TextID { get; set; }
-    public string Subject { get; set; }
-    public string Message { get; set; }
+    public string? Subject { get; set; }
+    public string? Message { get; set; }
     public int UserID { get; set; }
     public DateTime DateCreated { get; set; }
 #endregion
diff --git a/Models/TextQueue.cs b/Models/TextQueue.cs
index 8b45bc8..9d7327b 100644
--- a/Models/TextQueue.cs
+++ b/Models/TextQueue.cs
@@ -6,8 +6,8 @@ public class TextQueue
 {
 #region Properties
     public int TextQueueID { get; set; }
-    public string Status { get; set; }
-    public string ContactPhoneNumber { get; set; }
+    public string? Status { get; set; }
+    public string? ContactPhoneNumber { get; set; }
     public int TextID { get; set; }
     public int UserID { get; set; }
     public DateTime DateCreated { get; set; }
diff --git a/Repositories/BaseRepository.cs b/Repositories/BaseRepository.cs
index 1c69eb8..e437670 100644
--- a/Repositories/BaseRepository.cs
+++ b/Repositories/BaseRepository.cs
@@ -1,5 +1,5 @@
 
-using TextSender_API.Repositories;
+namespace TextSender_API.Repositories;
 
 public class BaseRepository
 {
diff --git a/Repositories/UsersRepository.cs b/Repositories/UsersRepository.cs
index e07720d..9f47561 100644
--- a/Repositories/UsersRepository.cs
+++ b/Repositories/UsersRepository.cs
@@ -1,6 +1,3 @@
-using System;
-
-using MongoDB.Bson;
 using MongoDB.Driver;
 
 using TextSender_API.Models;
@@ -100,7 +97,7 @@ public class SaltRepository : BaseRepository
 
     public Salt Retrieve(string userId)
     {
-        return this._bookCollection.Find(s => s.UserId.Equals(userId)).FirstOrDefault();
+        return this._bookCollection.Find(s => s.UserId!.Equals(userId)).FirstOrDefault();
     }
 
     public void Update(Salt salt)