diff --git a/lib/applications/hssf_row_extensions.rb b/lib/applications/hssf_row_extensions.rb
index 5e968e8c..9bfcae9d 100644
--- a/lib/applications/hssf_row_extensions.rb
+++ b/lib/applications/hssf_row_extensions.rb
@@ -6,9 +6,6 @@
 if DataShift::Guards.jruby?
 
   # Extend the Poi classes with some syntactic sugar
-
-  java_import  'org.apache.poi.ss.util.CellReference'
-
   module Java
 
     module OrgApachePoiHssfUsermodel
diff --git a/lib/applications/apache_poi_extensions.rb b/lib/applications/hssf_sheet_extensions.rb
similarity index 57%
rename from lib/applications/apache_poi_extensions.rb
rename to lib/applications/hssf_sheet_extensions.rb
index ed2cf11e..87d82a21 100644
--- a/lib/applications/apache_poi_extensions.rb
+++ b/lib/applications/hssf_sheet_extensions.rb
@@ -1,21 +1,13 @@
-# Copyright:: Autotelik Media Ltd
+# Copyright:: Autotelik Media Ltd 2016
 # Author ::   Tom Statter
-# Date ::     July 2010
+# Date ::     April 2016
 # License::
 #
 #
 if DataShift::Guards.jruby?
-
-  require 'java'
-  require 'poi-3.7-20101029.jar'
-
-  # Extend the Poi classes with some syntactic sugar
-
-  java_import  'org.apache.poi.ss.util.CellReference'
-
   module Java
-
     module OrgApachePoiHssfUsermodel
+
       class HSSFSheet
         def name
           getSheetName
@@ -26,6 +18,7 @@ def num_rows
         end
 
       end
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/applications/jexcel_file.rb b/lib/applications/jexcel_file.rb
index 6e7628d9..cdd946fb 100644
--- a/lib/applications/jexcel_file.rb
+++ b/lib/applications/jexcel_file.rb
@@ -1,11 +1,9 @@
 # Copyright:: Autotelik Media Ltd
 # Author ::   Tom Statter
-# Date ::     July 2010
+# Date ::     April 2016
 # License::
 #
-# A wrapper around creating and directly manipulating Excel files.
-#
-# i.e Create and populate XSL files
+# A wrapper around Apache POI - creating and directly manipulating Excel files.
 #
 # jar added to class path in manifest - 'poi-3.5-beta4-20081128.jar'
 #
@@ -15,6 +13,19 @@
   require 'poi-3.7-20101029.jar'
 
   require_relative 'ruby_poi_translations'
+  require_relative 'hssf_row_extensions'
+  require_relative 'hssf_sheet_extensions'
+
+  java_import 'org.apache.poi.hssf.util.HSSFColor'
+  java_import 'org.apache.poi.poifs.filesystem.POIFSFileSystem'
+
+  java_import 'org.apache.poi.hssf.usermodel.HSSFCell'
+  java_import 'org.apache.poi.hssf.usermodel.HSSFWorkbook'
+  java_import 'org.apache.poi.hssf.usermodel.HSSFCellStyle'
+  java_import 'org.apache.poi.hssf.usermodel.HSSFDataFormat'
+  java_import 'org.apache.poi.hssf.usermodel.HSSFClientAnchor'
+  java_import 'org.apache.poi.hssf.usermodel.HSSFRichTextString'
+  java_import 'org.apache.poi.ss.util.CellReference'
 
   class JExcelFile
 
@@ -23,16 +34,6 @@ class JExcelFile
 
     include Enumerable
 
-    java_import 'org.apache.poi.hssf.util.HSSFColor'
-    java_import 'org.apache.poi.poifs.filesystem.POIFSFileSystem'
-
-    java_import 'org.apache.poi.hssf.usermodel.HSSFCell'
-    java_import 'org.apache.poi.hssf.usermodel.HSSFWorkbook'
-    java_import 'org.apache.poi.hssf.usermodel.HSSFCellStyle'
-    java_import 'org.apache.poi.hssf.usermodel.HSSFDataFormat'
-    java_import 'org.apache.poi.hssf.usermodel.HSSFClientAnchor'
-    java_import 'org.apache.poi.hssf.usermodel.HSSFRichTextString'
-
     attr_accessor :workbook, :row, :date_style
     attr_reader :sheet, :current_sheet_index
 
@@ -227,6 +228,6 @@ def create_sheet_and_set_styles( sheet_name )
   end
 
   require 'jexcel_file_extensions'
-  require 'apache_poi_extensions'
+  require 'hssf_sheet_extensions'
 
 end