1 files changed, 4 insertions, 6 deletions
diff --git a/lib/models/user.ml b/lib/models/user.ml
index cd91a39..8edcea1 100644
--- a/lib/models/user.ml
+++ b/lib/models/user.ml
@@ -1,17 +1,15 @@
 module Make(Http : S.Http) = struct
     open Core
-    open User_t
-    
-    type t = User_t.t
+    include User_t
 
     let tag user =
-        Printf.sprintf "%s#%d" user.username user.discriminator
+        Printf.sprintf "%s#%s" user.username user.discriminator
 
-    let mention (user:User_t.t) =
+    let mention user =
         Printf.sprintf "<@%d>" user.id
 
     let default_avatar user =
-        let avatar = user.discriminator % 5 in
+        let avatar = Int.of_string user.discriminator % 5 in
         Endpoints.cdn_default_avatar avatar
 
     let face user = match user.avatar with