diff --git a/numberwords.py b/numberwords.py
index e7baab9..ba9e79a 100644
--- a/numberwords.py
+++ b/numberwords.py
@@ -17,12 +17,15 @@ TENS_NAMES = [
 def int_under_1000000_to_str(number):
     if number < 1000:
         return int_under_1000_to_str(number)
+
+    thousands, remainder = divide_with_remainder(number, 1000)
+    thousands_part = f"{int_under_1000_to_str(thousands)} thousand"
+
+    if remainder == 0:
+        return thousands_part
     else:
-        thousands, remainder = divide_with_remainder(number, 1000)
-        if remainder ==0:
-            return f"{int_under_1000_to_str(thousands)} thousand"
-        else:
-            return f"{int_under_1000_to_str(thousands)} thousand, {int_under_1000_to_str(remainder)}"
+        remainder_part = int_under_1000_to_str(remainder)
+        return f"{thousands_part} and {remainder_part}"
         
 def int_under_1000_to_str(number):
     if number < 100:
@@ -63,3 +66,4 @@ def divide_with_remainder(dividend, divisor):
     quotient = dividend // divisor
     remainder = dividend % divisor
     return quotient, remainder
+