diff --git a/source/painlessjson/painlessjson.d b/source/painlessjson/painlessjson.d
index 72dda46..92ab952 100644
--- a/source/painlessjson/painlessjson.d
+++ b/source/painlessjson/painlessjson.d
@@ -1,21 +1,20 @@
 module painlessjson.painlessjson;
 
+import std.algorithm : map;
 import std.string;
 import std.conv;
 import std.json;
 import std.range;
 import std.traits;
-import std.typecons : TypeTuple;
+import std.typecons : TypeTuple, Tuple;
 import painlessjson.traits;
 import painlessjson.annotations;
 import painlessjson.string;
 
 version (unittest)
 {
-    import std.algorithm;
-    import std.stdio;
+    import std.stdio : writeln;
     import painlessjson.unittesttypes;
-    import std.typecons;
     import dunit.toolkit;
 
 }
@@ -706,4 +705,4 @@ unittest
     auto value = fromJSON!CamelCaseConversion(parseJSON(q{{"was_camel_case":8,"was_underscore":9}}));
     assertEqual(value.wasCamelCase, 8);
     assertEqual(value.was_underscore, 9);
-}
\ No newline at end of file
+}