diff --git a/app.py b/app.py
index dd41f3b..05e7791 100644
--- a/app.py
+++ b/app.py
@@ -9,6 +9,7 @@ from musicbrainzngs.musicbrainz import ResponseError
 import api.discogs
 import api.deezer
 import api.imdb
+import utils
 
 from atom.factory import *
 
@@ -164,10 +165,8 @@ def music_get_album(album_id: str, locale: str):
 
         try:
             length_ms: int = int(track["track_or_recording_length"])
-            # FIXME: Add duration element
             length_elem: Element = doc.createElement("duration")
-            length_timespan: str = f"00:00:00.{length_ms:0>3}"
-            print("Duration:", length_timespan)
+            length_timespan: str = utils.format_timespan(length_ms)
             set_element_value(length_elem, length_timespan)
             entry.appendChild(length_elem)
         except:
@@ -175,9 +174,7 @@ def music_get_album(album_id: str, locale: str):
 
         try:
             track_position: str = track["position"]
-            # FIXME: Add track number element
             index_elem: Element = doc.createElement("trackNumber")
-            print("Track #:", track_position)
             set_element_value(index_elem, track_position)
             entry.appendChild(index_elem)
         except:
diff --git a/utils.py b/utils.py
index b18ccde..168b7fe 100644
--- a/utils.py
+++ b/utils.py
@@ -11,3 +11,12 @@ def get_json(url: str) -> Union[int, dict]:
         return error.code
 
     return json.load(response)
+
+
+def format_timespan(tmil: int) -> str:
+    tsec = tmil / float(1000)
+    min = int(tsec // 60)
+    sec = int(tsec % 60)
+    mil = tmil - (min * 60000 - sec * 1000)
+    return f"00:{min}:{sec}.{mil}"
+