j3dutils: use eclipse organize imports cleanup tool

Signed-off-by: Harvey Harrison <[email protected]>

290 files changed, 1706 insertions, 1175 deletions

diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
index 431f2a5..9f0b518 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
@@ -44,7 +44,9 @@
 
 package com.sun.j3d.audioengines;
 
-import javax.media.j3d.*;
+import javax.media.j3d.AudioDevice;
+import javax.media.j3d.PhysicalEnvironment;
+import javax.media.j3d.Sound;
 
 /**
  * The AudioEngine Class defines an audio output device that generates
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
index ce135af..c315b0f 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
@@ -44,10 +44,16 @@
 
 package com.sun.j3d.audioengines;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
 import java.util.ArrayList;
 
+import javax.media.j3d.AudioDevice3D;
+import javax.media.j3d.MediaContainer;
+import javax.media.j3d.PhysicalEnvironment;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.View;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
+
 
 /**
  * The AudioEngine3D Class defines an audio output device that generates
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
index 33e84f0..3f53064 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
@@ -44,9 +44,10 @@
 
 package com.sun.j3d.audioengines;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.util.ArrayList;
+import javax.media.j3d.AudioDevice3DL2;
+import javax.media.j3d.AuralAttributes;
+import javax.media.j3d.PhysicalEnvironment;
+import javax.media.j3d.Sound;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
index 2c8c899..a77f970 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
@@ -48,7 +48,6 @@ package com.sun.j3d.audioengines;
  * Audio Engine Thread
  */
 
-import javax.media.j3d.*;
 
 /**
  * The Thread Class extended for Audio Device engines that must process
diff --git a/src/classes/share/com/sun/j3d/audioengines/AuralParameters.java b/src/classes/share/com/sun/j3d/audioengines/AuralParameters.java
index 75aa190..440ef92 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AuralParameters.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AuralParameters.java
@@ -44,8 +44,6 @@
 
 package com.sun.j3d.audioengines;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
 
 /**
  * The AuralParameters Class defines a set of fields that define the
diff --git a/src/classes/share/com/sun/j3d/audioengines/Sample.java b/src/classes/share/com/sun/j3d/audioengines/Sample.java
index 3cd092b..ce943d1 100644
--- a/src/classes/share/com/sun/j3d/audioengines/Sample.java
+++ b/src/classes/share/com/sun/j3d/audioengines/Sample.java
@@ -44,8 +44,14 @@
 
 package com.sun.j3d.audioengines;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.MediaContainer;
+import javax.media.j3d.Sound;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.View;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3d;
+import javax.vecmath.Vector3f;
 
 /**
  * The Sample class defines the data and methods associated with a sound
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java
index 7d16146..567eaa6 100755
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSAuralParameters.java
@@ -44,8 +44,6 @@
 
 package com.sun.j3d.audioengines.javasound;
 
-import java.lang.String;
-import java.io.*;
 
 /**
  * The AudioDevice dependent sound node and aural attribute node parameters.
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java
index 2f07e40..a29c11b 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSChannel.java
@@ -50,15 +50,15 @@
 package com.sun.j3d.audioengines.javasound;
 
 // import java.applet.*;
-import java.util.*;
-import java.lang.String;
-import java.net.*;
-import java.io.*;
 import java.io.InputStream;
-// import sun.applet.*;
-import javax.sound.sampled.*;
-import com.sun.j3d.audioengines.*;
-// import javax.media.j3d.*;
+import java.net.URL;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.DataLine;
+
+import com.sun.j3d.audioengines.Sample;
 
 /**
  * The JSChannel Class defines an audio output methods that call JavaSound
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
index b533592..7c51638 100755
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
@@ -49,13 +49,12 @@
 
 package com.sun.j3d.audioengines.javasound;
 
-import java.applet.*;
-import java.util.*;
-import java.lang.String;
-import java.net.*;
-import java.io.*;
-import java.io.InputStream;
-import javax.sound.sampled.*;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.DataLine;
+import javax.sound.sampled.LineEvent;
 
 /**
  * The JSClip Class defines an audio output methods that call JavaSound
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
index 276cd57..29f997e 100755
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
@@ -51,9 +51,10 @@
 
 package com.sun.j3d.audioengines.javasound;
 
-import javax.media.j3d.*;
-import com.sun.j3d.audioengines.*;
-import javax.vecmath.*;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
+
+import com.sun.j3d.audioengines.AuralParameters;
 
 /**
  * The PostionalSample Class defines the data and methods associated with a
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
index 20a9682..9c83e96 100755
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
@@ -51,9 +51,14 @@
 
 package com.sun.j3d.audioengines.javasound;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import com.sun.j3d.audioengines.*;
+import javax.media.j3d.PhysicalBody;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.View;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
+
+import com.sun.j3d.audioengines.AuralParameters;
 
 /**
  * The PostionalSample Class defines the data and methods associated with a
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
index 750e177..fee82cb 100755
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
@@ -51,11 +51,15 @@
 
 package com.sun.j3d.audioengines.javasound;
 
-import java.net.URL;
 import java.io.InputStream;
-import javax.media.j3d.*;
-import javax.sound.sampled.*;
-import com.sun.j3d.audioengines.*;
+import java.net.URL;
+
+import javax.media.j3d.MediaContainer;
+import javax.media.j3d.View;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.DataLine;
+
+import com.sun.j3d.audioengines.AuralParameters;
 
 /**
  * The Sample Class extended for Java Sound Mixer specific audio device.
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
index 9bde9fb..7b27656 100755
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
@@ -51,8 +51,8 @@ package com.sun.j3d.audioengines.javasound;
  * to be rewritten.  When this is done, we may or may not need this class.
  */
 
-import javax.media.j3d.*;
-import com.sun.j3d.audioengines.*;
+import com.sun.j3d.audioengines.AudioEngine3D;
+import com.sun.j3d.audioengines.AudioEngine3DL2;
 
 /**
  * The Thread Class extended for JavaSound Mixer specific audio device
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
index 75ce7ae..c61e5f8 100755
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
@@ -51,13 +51,16 @@
 
 package com.sun.j3d.audioengines.javasound;
 
-import java.net.URL;
-import java.io.InputStream;
-import javax.vecmath.*;
-import javax.media.j3d.*;
-import com.sun.j3d.audioengines.*;
-import java.util.ArrayList;
-import java.lang.Thread;
+import javax.media.j3d.AudioDevice3D;
+import javax.media.j3d.MediaContainer;
+import javax.media.j3d.PhysicalEnvironment;
+import javax.media.j3d.Sound;
+import javax.media.j3d.Transform3D;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
+
+import com.sun.j3d.audioengines.AudioEngine3DL2;
+import com.sun.j3d.audioengines.Sample;
 
 /**
  * The JavaSoundMixer Class defines an audio output device that accesses
diff --git a/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java b/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java
index 369944c..5818fe1 100644
--- a/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java
+++ b/src/classes/share/com/sun/j3d/exp/swing/JCanvas3D.java
@@ -44,7 +44,6 @@
 
 package com.sun.j3d.exp.swing;
 
-import com.sun.j3d.exp.swing.impl.AutoOffScreenCanvas3D;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.GraphicsConfigTemplate;
@@ -54,11 +53,14 @@ import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.lang.reflect.InvocationTargetException;
+
 import javax.media.j3d.Canvas3D;
 import javax.media.j3d.GraphicsConfigTemplate3D;
 import javax.swing.JPanel;
 import javax.swing.event.AncestorListener;
 
+import com.sun.j3d.exp.swing.impl.AutoOffScreenCanvas3D;
+
 
 /**
  * This class provides a lightweight capability to Java 3D. The component
diff --git a/src/classes/share/com/sun/j3d/internal/BufferWrapper.java b/src/classes/share/com/sun/j3d/internal/BufferWrapper.java
index 7334dc5..8751f68 100755
--- a/src/classes/share/com/sun/j3d/internal/BufferWrapper.java
+++ b/src/classes/share/com/sun/j3d/internal/BufferWrapper.java
@@ -44,9 +44,10 @@
 
 package com.sun.j3d.internal;
 
-import javax.media.j3d.J3DBuffer;
 import java.nio.Buffer;
 
+import javax.media.j3d.J3DBuffer;
+
 /**
  * NIO Buffers are new in Java 1.4 but we need to run on 1.3
  * as well, so this class was created to hide the NIO classes
diff --git a/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java b/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java
index e673ae7..b15dcca 100755
--- a/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java
+++ b/src/classes/share/com/sun/j3d/internal/ByteBufferWrapper.java
@@ -44,10 +44,11 @@
 
 package com.sun.j3d.internal;
 
-import javax.media.j3d.J3DBuffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import javax.media.j3d.J3DBuffer;
+
 /**
  * NIO Buffers are new in Java 1.4 but we need to run on 1.3
  * as well, so this class was created to hide the NIO classes
diff --git a/src/classes/share/com/sun/j3d/internal/ByteOrderWrapper.java b/src/classes/share/com/sun/j3d/internal/ByteOrderWrapper.java
index 4fd707e..d997f78 100755
--- a/src/classes/share/com/sun/j3d/internal/ByteOrderWrapper.java
+++ b/src/classes/share/com/sun/j3d/internal/ByteOrderWrapper.java
@@ -44,8 +44,6 @@
 
 package com.sun.j3d.internal;
 
-import javax.media.j3d.J3DBuffer;
-import java.nio.Buffer;
 import java.nio.ByteOrder;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/internal/Distance.java b/src/classes/share/com/sun/j3d/internal/Distance.java
index 4f232e3..2cc036e 100644
--- a/src/classes/share/com/sun/j3d/internal/Distance.java
+++ b/src/classes/share/com/sun/j3d/internal/Distance.java
@@ -60,7 +60,8 @@
 
 package com.sun.j3d.internal;
 
-import javax.vecmath.*;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
 
 /**
  * Utility class used to calculate distance. Contains static methods
diff --git a/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java b/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java
index d37fc78..bd0fa49 100755
--- a/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java
+++ b/src/classes/share/com/sun/j3d/internal/DoubleBufferWrapper.java
@@ -44,9 +44,10 @@
 
 package com.sun.j3d.internal;
 
-import javax.media.j3d.J3DBuffer;
 import java.nio.DoubleBuffer;
 
+import javax.media.j3d.J3DBuffer;
+
 /**
  * NIO Buffers are new in Java 1.4 but we need to run on 1.3
  * as well, so this class was created to hide the NIO classes
diff --git a/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java b/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java
index 0947a53..b4747e7 100755
--- a/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java
+++ b/src/classes/share/com/sun/j3d/internal/FloatBufferWrapper.java
@@ -44,9 +44,10 @@
 
 package com.sun.j3d.internal;
 
-import javax.media.j3d.J3DBuffer;
 import java.nio.FloatBuffer;
 
+import javax.media.j3d.J3DBuffer;
+
 /**
  * NIO Buffers are new in Java 1.4 but we need to run on 1.3
  * as well, so this class was created to hide the NIO classes
diff --git a/src/classes/share/com/sun/j3d/internal/J3dUtilsI18N.java b/src/classes/share/com/sun/j3d/internal/J3dUtilsI18N.java
index e264005..7143e04 100644
--- a/src/classes/share/com/sun/j3d/internal/J3dUtilsI18N.java
+++ b/src/classes/share/com/sun/j3d/internal/J3dUtilsI18N.java
@@ -44,8 +44,8 @@
 
 package com.sun.j3d.internal;
 
-import java.io.*;
-import java.util.*;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 
 public class J3dUtilsI18N {
diff --git a/src/classes/share/com/sun/j3d/loaders/Loader.java b/src/classes/share/com/sun/j3d/loaders/Loader.java
index cd719bc..3fd36a4 100644
--- a/src/classes/share/com/sun/j3d/loaders/Loader.java
+++ b/src/classes/share/com/sun/j3d/loaders/Loader.java
@@ -44,9 +44,9 @@
 
 package com.sun.j3d.loaders;
 
-import java.net.URL;
-import java.io.Reader;
 import java.io.FileNotFoundException;
+import java.io.Reader;
+import java.net.URL;
 
 /**
  * The Loader interface is used to specify the location
diff --git a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java b/src/classes/share/com/sun/j3d/loaders/LoaderBase.java
index cc5a541..5148669 100644
--- a/src/classes/share/com/sun/j3d/loaders/LoaderBase.java
+++ b/src/classes/share/com/sun/j3d/loaders/LoaderBase.java
@@ -45,7 +45,6 @@
 package com.sun.j3d.loaders;
 
 import java.net.URL;
-import java.io.Reader;
 
 /**
  * This class implements the Loader interface.  To use
diff --git a/src/classes/share/com/sun/j3d/loaders/Scene.java b/src/classes/share/com/sun/j3d/loaders/Scene.java
index 36ee9e4..eec8fb9 100644
--- a/src/classes/share/com/sun/j3d/loaders/Scene.java
+++ b/src/classes/share/com/sun/j3d/loaders/Scene.java
@@ -46,13 +46,13 @@ package com.sun.j3d.loaders;
 
 import java.util.Hashtable;
 
+import javax.media.j3d.Background;
 import javax.media.j3d.Behavior;
 import javax.media.j3d.BranchGroup;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.Light;
-import javax.media.j3d.Background;
 import javax.media.j3d.Fog;
+import javax.media.j3d.Light;
 import javax.media.j3d.Sound;
+import javax.media.j3d.TransformGroup;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/SceneBase.java b/src/classes/share/com/sun/j3d/loaders/SceneBase.java
index a0b82bb..8cfa9dd 100644
--- a/src/classes/share/com/sun/j3d/loaders/SceneBase.java
+++ b/src/classes/share/com/sun/j3d/loaders/SceneBase.java
@@ -44,19 +44,16 @@
 
 package com.sun.j3d.loaders;
 
-import java.lang.Float;
-
 import java.util.Hashtable;
 import java.util.Vector;
-import java.util.Enumeration;
 
+import javax.media.j3d.Background;
 import javax.media.j3d.Behavior;
 import javax.media.j3d.BranchGroup;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.Light;
-import javax.media.j3d.Background;
 import javax.media.j3d.Fog;
+import javax.media.j3d.Light;
 import javax.media.j3d.Sound;
+import javax.media.j3d.TransformGroup;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java b/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java
index 1bf8dc9..5819851 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/EnvelopeHandler.java
@@ -45,14 +45,11 @@
 package com.sun.j3d.loaders.lw3d;
 
 import java.io.StreamTokenizer;
-import java.io.IOException;
 import java.lang.reflect.Constructor;
-import com.sun.j3d.loaders.ParsingErrorException;
-import java.lang.ClassNotFoundException;
-import java.lang.InstantiationException;
-import java.lang.IllegalAccessException;
 import java.lang.reflect.InvocationTargetException;
 
+import com.sun.j3d.loaders.ParsingErrorException;
+
 
 /**
  * This class is used in implementing Envelope objects (of which there
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java
index 6c23687..d6bdc62 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/FloatValueInterpolator.java
@@ -44,15 +44,9 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import javax.vecmath.*;
-import java.util.BitSet;
-import java.util.Enumeration;
-
 import javax.media.j3d.Alpha;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeReferenceTable;
-import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Interpolator;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java b/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
index 7764f20..bb23ac0 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/J3dLwoParser.java
@@ -44,21 +44,27 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import java.awt.Component;
-import java.awt.Image;
+import java.io.FileNotFoundException;
+import java.net.URL;
 import java.util.Enumeration;
 import java.util.Vector;
+
+import javax.media.j3d.Appearance;
+import javax.media.j3d.ColoringAttributes;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.Material;
+import javax.media.j3d.PointAttributes;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Texture;
+import javax.media.j3d.TextureAttributes;
+import javax.media.j3d.TransparencyAttributes;
+import javax.vecmath.Color3f;
+import javax.vecmath.Vector3f;
+
+import com.sun.j3d.loaders.IncorrectFormatException;
 import com.sun.j3d.utils.geometry.GeometryInfo;
 import com.sun.j3d.utils.geometry.NormalGenerator;
 import com.sun.j3d.utils.geometry.Stripifier;
-import com.sun.j3d.utils.image.TextureLoader;
-import com.sun.j3d.loaders.IncorrectFormatException;
-import java.io.FileNotFoundException;
-
-import javax.media.j3d.*;
-import javax.vecmath.*;
-
-import java.net.*;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
index 6c3d4e7..ccdc7c7 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LWOBFileReader.java
@@ -46,11 +46,11 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileInputStream;
 import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+
 import com.sun.j3d.loaders.ParsingErrorException;
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
index 2fda42e..4bf3bb3 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LightIntensityPathInterpolator.java
@@ -44,10 +44,9 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import java.util.*;
+import java.util.Enumeration;
 
 import javax.media.j3d.Alpha;
-import javax.media.j3d.Light;
 
 /**
  * This Interpolator object modifies the intensity of a Light object
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
index 211544d..b542fc3 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/Lw3dLoader.java
@@ -45,18 +45,34 @@
 package com.sun.j3d.loaders.lw3d;
 
 
-import com.sun.j3d.loaders.*;
-import java.awt.Component;
-import java.io.*;
-import java.util.Vector;
-import java.util.Enumeration;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StreamTokenizer;
 import java.net.URL;
-import java.net.MalformedURLException;
+import java.util.Enumeration;
+import java.util.Vector;
 
-import javax.media.j3d.*;
+import javax.media.j3d.AmbientLight;
+import javax.media.j3d.Background;
+import javax.media.j3d.Behavior;
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Fog;
+import javax.media.j3d.TransformGroup;
 import javax.vecmath.Color3f;
 import javax.vecmath.Point3d;
 
+import com.sun.j3d.loaders.IncorrectFormatException;
+import com.sun.j3d.loaders.Loader;
+import com.sun.j3d.loaders.ParsingErrorException;
+import com.sun.j3d.loaders.Scene;
+import com.sun.j3d.loaders.SceneBase;
+
 
 /**
  * This class implements the Loader API and allows users to load
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java
index 8d503df..59a4a2d 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwLightObject.java
@@ -46,8 +46,8 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import javax.vecmath.Color3f;
 import javax.media.j3d.Light;
+import javax.vecmath.Color3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java
index 52f6bfe..4e30ece 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoParser.java
@@ -46,17 +46,14 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.Vector;
-import java.util.Date;
+import java.net.URL;
 import java.util.Enumeration;
-import com.sun.j3d.loaders.lw3d.LWOBFileReader;
-import com.sun.j3d.internal.J3dUtilsI18N;
-import java.net.*;
-import com.sun.j3d.loaders.ParsingErrorException;
+import java.util.Vector;
+
 import com.sun.j3d.loaders.IncorrectFormatException;
+import com.sun.j3d.loaders.ParsingErrorException;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java
index 1b858c7..6d04146 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoSurface.java
@@ -45,14 +45,14 @@
 package com.sun.j3d.loaders.lw3d;
 
 import java.awt.Image;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Vector;
-import java.util.Enumeration;
+
 import javax.vecmath.Color3f;
 import javax.vecmath.Vector3f;
-import com.sun.j3d.loaders.lw3d.LWOBFileReader;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
-import java.io.FileNotFoundException;
 import com.sun.j3d.loaders.IncorrectFormatException;
 import com.sun.j3d.loaders.ParsingErrorException;
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java
index d27b3aa..5b866fa 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwoTexture.java
@@ -44,26 +44,19 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import java.awt.Component;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferInt;
-import java.io.FileReader;
-import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.Vector;
-import java.util.Enumeration;
 import java.util.Hashtable;
-import javax.vecmath.Color3f;
-import javax.vecmath.Vector3f;
-import com.sun.j3d.utils.image.TextureLoader;
+
 import javax.media.j3d.Texture;
 import javax.media.j3d.Texture2D;
-import javax.media.j3d.ImageComponent;
-import javax.media.j3d.ImageComponent2D;
-import com.sun.j3d.loaders.lw3d.LWOBFileReader;
-import java.io.FileNotFoundException;
+import javax.vecmath.Color3f;
+import javax.vecmath.Vector3f;
+
 import com.sun.j3d.loaders.ParsingErrorException;
+import com.sun.j3d.utils.image.TextureLoader;
 
 /**
  * This class is responsible for parsing the binary data in an Object file
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java
index 48e3abb..71d352f 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsBackground.java
@@ -46,10 +46,14 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.util.Enumeration;
+import java.io.IOException;
+import java.io.StreamTokenizer;
+
+import javax.media.j3d.Background;
+import javax.media.j3d.BoundingSphere;
+import javax.vecmath.Color3f;
+import javax.vecmath.Point3d;
+
 import com.sun.j3d.loaders.ParsingErrorException;
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
index 8ff8836..b588d26 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsCamera.java
@@ -46,11 +46,15 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.*;
+import java.io.IOException;
+import java.io.StreamTokenizer;
 import java.util.Vector;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.util.Enumeration;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Matrix4d;
+
 import com.sun.j3d.loaders.ParsingErrorException;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java
index 22839ce..6112606 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelope.java
@@ -44,12 +44,15 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import java.io.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.io.IOException;
+import java.io.StreamTokenizer;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.TransformGroup;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.loaders.ParsingErrorException;
 import com.sun.j3d.loaders.IncorrectFormatException;
+import com.sun.j3d.loaders.ParsingErrorException;
 
 /**
  * This class is a superclass for any implementation of envelopes; the
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java
index cfb21bf..1597cd9 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeFrame.java
@@ -46,10 +46,7 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.*;
-import javax.vecmath.Matrix4d;
-import javax.vecmath.Vector3d;
-import javax.vecmath.Point3f;
+import java.io.StreamTokenizer;
 
 /**
  * This class represents one keyframe in an envelope sequence.
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
index f26feb6..8f54473 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsEnvelopeLightIntensity.java
@@ -46,10 +46,13 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.io.StreamTokenizer;
+
+import javax.media.j3d.Alpha;
+import javax.media.j3d.Behavior;
+import javax.media.j3d.BoundingSphere;
 import javax.media.j3d.TransformGroup;
+import javax.vecmath.Point3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java
index 22b19bd..4c08a18 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFog.java
@@ -46,10 +46,15 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.util.Enumeration;
+import java.io.IOException;
+import java.io.StreamTokenizer;
+
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.Fog;
+import javax.media.j3d.LinearFog;
+import javax.vecmath.Color3f;
+import javax.vecmath.Point3d;
+
 import com.sun.j3d.loaders.ParsingErrorException;
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java
index 4e16097..fab3a40 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsFrame.java
@@ -46,10 +46,11 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.*;
+import java.io.StreamTokenizer;
+
 import javax.vecmath.Matrix4d;
-import javax.vecmath.Vector3d;
 import javax.vecmath.Point3f;
+import javax.vecmath.Vector3d;
 
 /**
  * This class is responsible for parsing the data in a Scene file
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
index 6bf9419..4a33dc5 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsLight.java
@@ -46,11 +46,24 @@ package com.sun.j3d.loaders.lw3d;
 
 
 
-import java.io.*;
+import java.io.IOException;
+import java.io.StreamTokenizer;
 import java.util.Vector;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.util.Enumeration;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.DirectionalLight;
+import javax.media.j3d.Light;
+import javax.media.j3d.PointLight;
+import javax.media.j3d.SpotLight;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Color3f;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
+
 import com.sun.j3d.loaders.ParsingErrorException;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java
index e152a33..ec3793d 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsMotion.java
@@ -44,15 +44,25 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import java.io.*;
+import java.io.StreamTokenizer;
 import java.util.Enumeration;
 import java.util.Vector;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import com.sun.j3d.utils.behaviors.interpolators.*;
+
+import javax.media.j3d.Alpha;
+import javax.media.j3d.Behavior;
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Quat4f;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
-import com.sun.j3d.loaders.ParsingErrorException;
 import com.sun.j3d.loaders.IncorrectFormatException;
+import com.sun.j3d.loaders.ParsingErrorException;
+import com.sun.j3d.utils.behaviors.interpolators.KBKeyFrame;
+import com.sun.j3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
 
 /**
  * This class is responsible for parsing the data in a Scene file related to
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
index bef1c44..51c541b 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsObject.java
@@ -45,20 +45,26 @@
 package com.sun.j3d.loaders.lw3d;
 
 
-import java.awt.Component;
-import java.io.*;
-import java.util.Vector;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.StreamTokenizer;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Enumeration;
 import java.util.StringTokenizer;
 import java.util.Vector;
-import com.sun.j3d.utils.geometry.ColorCube;
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.loaders.IncorrectFormatException;
-import java.net.MalformedURLException;
 
-import java.net.*;
+import javax.media.j3d.Behavior;
+import javax.media.j3d.Group;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Vector3f;
+
+import com.sun.j3d.loaders.IncorrectFormatException;
+import com.sun.j3d.loaders.ParsingErrorException;
 
 /**
  * An LwsObject is passed a handle to the text file that contains the scene
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java
index bb14ebb..adfd8c4 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/LwsPrimitive.java
@@ -47,7 +47,7 @@ package com.sun.j3d.loaders.lw3d;
 
 
 import java.util.Vector;
-import javax.media.j3d.Group;
+
 import javax.media.j3d.TransformGroup;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java
index 54d8144..de9431e 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceLine.java
@@ -44,21 +44,27 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import java.awt.Component;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
-import java.io.StreamTokenizer;
+import java.io.FileNotFoundException;
 import java.io.IOException;
-import javax.media.j3d.*;
+import java.io.StreamTokenizer;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.media.j3d.Alpha;
+import javax.media.j3d.Behavior;
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.Group;
+import javax.media.j3d.Link;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.SharedGroup;
+import javax.media.j3d.Switch;
+import javax.media.j3d.SwitchValueInterpolator;
+import javax.media.j3d.TransformGroup;
 import javax.vecmath.Point3d;
 
 import com.sun.j3d.loaders.IncorrectFormatException;
 import com.sun.j3d.loaders.ParsingErrorException;
-import java.io.FileNotFoundException;
 
 /**
  * This class was created to handle "sequence files", which allow
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java
index b2b545e..e274916 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SequenceReader.java
@@ -44,21 +44,21 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import java.awt.Component;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
 import java.io.BufferedReader;
-import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
-import java.io.StreamTokenizer;
 import java.io.IOException;
-import javax.media.j3d.*;
+import java.io.StreamTokenizer;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import javax.media.j3d.Alpha;
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.Switch;
+import javax.media.j3d.TransformGroup;
 import javax.vecmath.Point3d;
 
-import com.sun.j3d.loaders.IncorrectFormatException;
 import com.sun.j3d.loaders.ParsingErrorException;
-import java.io.FileNotFoundException;
 
 /**
  * This class was created to read a special file format devised for
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java b/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java
index 5a7cf57..25ae39f 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/ShapeHolder.java
@@ -45,6 +45,7 @@
 package com.sun.j3d.loaders.lw3d;
 
 import java.util.Vector;
+
 import javax.vecmath.Vector3f;
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java b/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
index 3c2ff73..97a55e5 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/SwitchPathInterpolator.java
@@ -45,15 +45,11 @@
  package com.sun.j3d.loaders.lw3d;
 
 
-import javax.vecmath.*;
-import java.util.BitSet;
 import java.util.Enumeration;
 
 import javax.media.j3d.Alpha;
-import javax.media.j3d.Node;
-import javax.media.j3d.NodeReferenceTable;
-import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Switch;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java b/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java
index 66daab2..3b0bbac 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/TargaReader.java
@@ -44,23 +44,17 @@
 
 package com.sun.j3d.loaders.lw3d;
 
+import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
-import java.applet.Applet;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.MediaTracker;
-import java.awt.Frame;
-import java.awt.Image;
-import java.awt.image.MemoryImageSource;
-import java.awt.Toolkit;
-import java.io.FileNotFoundException;
+import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.FileInputStream;
-import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
 import com.sun.j3d.loaders.IncorrectFormatException;
 import com.sun.j3d.loaders.ParsingErrorException;
-import java.io.IOException;
 
 /**
  * This class parses a standard Targa file and retrieves the image stored
diff --git a/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java b/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java
index 5d4167d..d881d81 100644
--- a/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java
+++ b/src/classes/share/com/sun/j3d/loaders/lw3d/TextfileParser.java
@@ -44,7 +44,9 @@
 
 package com.sun.j3d.loaders.lw3d;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.StreamTokenizer;
+
 import com.sun.j3d.loaders.ParsingErrorException;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
index bcf4303..4477a14 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
+++ b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFile.java
@@ -44,35 +44,32 @@
 
 package com.sun.j3d.loaders.objectfile;
 
-import com.sun.j3d.loaders.Scene;
-import com.sun.j3d.loaders.SceneBase;
-import com.sun.j3d.loaders.Loader;
-import com.sun.j3d.loaders.IncorrectFormatException;
-import com.sun.j3d.loaders.ParsingErrorException;
-import com.sun.j3d.loaders.objectfile.ObjectFileParser;
-import com.sun.j3d.loaders.objectfile.ObjectFileMaterials;
-import com.sun.j3d.utils.geometry.GeometryInfo;
-import com.sun.j3d.utils.geometry.NormalGenerator;
-import com.sun.j3d.utils.geometry.Stripifier;
-import java.io.FileNotFoundException;
-import java.io.StreamTokenizer;
-import java.io.Reader;
 import java.io.BufferedReader;
-import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
-import java.io.InputStreamReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.HashMap;
-import java.util.StringTokenizer;
-import javax.media.j3d.*;
-import javax.vecmath.Color3f;
+import java.util.Iterator;
+
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Shape3D;
 import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
 import javax.vecmath.TexCoord2f;
-import java.net.MalformedURLException;
+import javax.vecmath.Vector3f;
+
+import com.sun.j3d.loaders.IncorrectFormatException;
+import com.sun.j3d.loaders.Loader;
+import com.sun.j3d.loaders.ParsingErrorException;
+import com.sun.j3d.loaders.Scene;
+import com.sun.j3d.loaders.SceneBase;
+import com.sun.j3d.utils.geometry.GeometryInfo;
+import com.sun.j3d.utils.geometry.NormalGenerator;
+import com.sun.j3d.utils.geometry.Stripifier;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java
index f856104..c575272 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java
+++ b/src/classes/share/com/sun/j3d/loaders/objectfile/ObjectFileParser.java
@@ -44,9 +44,10 @@
 
 package com.sun.j3d.loaders.objectfile;
 
-import java.io.StreamTokenizer;
 import java.io.IOException;
 import java.io.Reader;
+import java.io.StreamTokenizer;
+
 import com.sun.j3d.loaders.ParsingErrorException;
 
 class ObjectFileParser extends StreamTokenizer {
diff --git a/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java b/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java
index c47892a..74c99dc 100644
--- a/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java
+++ b/src/classes/share/com/sun/j3d/loaders/objectfile/RgbFile.java
@@ -44,18 +44,16 @@
 
 package com.sun.j3d.loaders.objectfile;
 
-import java.io.BufferedInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import java.awt.Transparency;
+import java.awt.color.ColorSpace;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
+import java.awt.image.ComponentColorModel;
 import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferByte;
-import java.awt.image.ComponentColorModel;
 import java.awt.image.WritableRaster;
-import java.awt.color.ColorSpace;
-import java.awt.Transparency;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 class RgbFile extends BufferedInputStream {
 
diff --git a/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java b/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java
index 63741dc..409b125 100644
--- a/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java
+++ b/src/classes/share/com/sun/j3d/utils/applet/JMainFrame.java
@@ -74,14 +74,29 @@
 
 package com.sun.j3d.utils.applet;
 
-import java.applet.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.io.*;
-import java.net.*;
-import javax.swing.*;
-import java.util.*;
+import java.applet.Applet;
+import java.applet.AppletContext;
+import java.applet.AppletStub;
+import java.applet.AudioClip;
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Image;
+import java.awt.Label;
+import java.awt.Toolkit;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.ImageProducer;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.swing.JFrame;
 
 public class JMainFrame extends JFrame
     implements Runnable, AppletStub, AppletContext {
diff --git a/src/classes/share/com/sun/j3d/utils/applet/MainFrame.java b/src/classes/share/com/sun/j3d/utils/applet/MainFrame.java
index e8e8461..5d462d9 100644
--- a/src/classes/share/com/sun/j3d/utils/applet/MainFrame.java
+++ b/src/classes/share/com/sun/j3d/utils/applet/MainFrame.java
@@ -74,13 +74,28 @@
 
 package com.sun.j3d.utils.applet;
 
-import java.applet.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import java.applet.Applet;
+import java.applet.AppletContext;
+import java.applet.AppletStub;
+import java.applet.AudioClip;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Image;
+import java.awt.Label;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.ImageProducer;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
 /// Run an Applet as an application.
 // <P>
diff --git a/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java b/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java
index 41c381f..b62ba34 100644
--- a/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java
+++ b/src/classes/share/com/sun/j3d/utils/audio/DistanceAttenuation.java
@@ -51,10 +51,9 @@
 
 package com.sun.j3d.utils.audio;
 
-import java.io.* ;
-import javax.vecmath.* ;
-import java.lang.String;
-import javax.media.j3d.*;
+import javax.media.j3d.SoundException;
+import javax.vecmath.Point2f;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 public class DistanceAttenuation
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java
index e69a2ff..085dd46 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineCurve.java
@@ -44,9 +44,6 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java
index 582226f..f5d9725 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/CubicSplineSegment.java
@@ -44,9 +44,9 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Point3f;
+import javax.vecmath.Quat4f;
+import javax.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
index dfc10dc..4c2bed9 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineCurve.java
@@ -44,9 +44,6 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
index 20ea2a2..4eee647 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBCubicSplineSegment.java
@@ -44,9 +44,8 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java
index 4a8bad8..8ce4d97 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBKeyFrame.java
@@ -44,9 +44,8 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Point3f;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
index 1b7d032..77205a8 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolator.java
@@ -44,9 +44,15 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.media.j3d.Alpha;
+import javax.media.j3d.Node;
+import javax.media.j3d.NodeComponent;
+import javax.media.j3d.RestrictedAccessException;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
index bf6695e..49dd131 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/KBSplinePathInterpolator.java
@@ -44,9 +44,14 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.media.j3d.Alpha;
+import javax.media.j3d.Node;
+import javax.media.j3d.NodeComponent;
+import javax.media.j3d.RestrictedAccessException;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.TransformInterpolator;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
index 3caeebe..d6c48d3 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolator.java
@@ -44,9 +44,17 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.media.j3d.Alpha;
+import javax.media.j3d.Node;
+import javax.media.j3d.NodeComponent;
+import javax.media.j3d.RestrictedAccessException;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Quat4f;
+import javax.vecmath.Vector3d;
+import javax.vecmath.Vector3f;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java
index 270329b..1097ae4 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBKeyFrame.java
@@ -44,9 +44,9 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Point3f;
+import javax.vecmath.Quat4f;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
index 9f6c3ca..974e313 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/interpolators/TCBSplinePathInterpolator.java
@@ -44,9 +44,14 @@
 
 package com.sun.j3d.utils.behaviors.interpolators;
 
-import javax.media.j3d.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.media.j3d.Alpha;
+import javax.media.j3d.Node;
+import javax.media.j3d.NodeComponent;
+import javax.media.j3d.RestrictedAccessException;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.TransformInterpolator;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java b/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java
index 72d5116..97efc76 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigator.java
@@ -44,11 +44,14 @@
 
 package com.sun.j3d.utils.behaviors.keyboard;
 
-import java.io.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.awt.event.*;
+import java.awt.event.KeyEvent;
+
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point3d;
+import javax.vecmath.Quat4d;
+import javax.vecmath.Vector3d;
 
 /**
  * This is the KeyNavigator class.  It accumulates AWT key events (key
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
index f2783f7..5cdf77f 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/keyboard/KeyNavigatorBehavior.java
@@ -44,13 +44,22 @@
 
 package com.sun.j3d.utils.behaviors.keyboard;
 
-import java.awt.event.*;
 import java.awt.AWTEvent;
-import java.util.Enumeration;
 import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.util.Enumeration;
 import java.util.LinkedList;
-import javax.vecmath.*;
-import javax.media.j3d.*;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCondition;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOnBehaviorPost;
+import javax.media.j3d.WakeupOnElapsedFrames;
+import javax.media.j3d.WakeupOr;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java
index b323eee..9d11c47 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseBehavior.java
@@ -44,11 +44,23 @@
 
 package com.sun.j3d.utils.behaviors.mouse;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.awt.Component;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.util.Enumeration;
+import java.util.LinkedList;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOnBehaviorPost;
+import javax.media.j3d.WakeupOr;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java
index baa2c22..6eb2a67 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseRotate.java
@@ -44,11 +44,18 @@
 
 package com.sun.j3d.utils.behaviors.mouse;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.event.MouseEvent;
+import java.util.Enumeration;
+
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOnBehaviorPost;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Vector3d;
 
 /**
  * MouseRotate is a Java3D behavior object that lets users control the
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java
index 7b79ea3..2c978cb 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseTranslate.java
@@ -44,11 +44,17 @@
 
 package com.sun.j3d.utils.behaviors.mouse;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.event.MouseEvent;
+import java.util.Enumeration;
+
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOnBehaviorPost;
+import javax.vecmath.Vector3d;
 
 /**
  * MouseTranslate is a Java3D behavior object that lets users control the
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java
index 0c071fc..760c377 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseWheelZoom.java
@@ -44,11 +44,18 @@
 
 package com.sun.j3d.utils.behaviors.mouse;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
+import java.util.Enumeration;
+
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOnBehaviorPost;
+import javax.vecmath.Vector3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java
index a5f86c9..39fd027 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/mouse/MouseZoom.java
@@ -44,11 +44,17 @@
 
 package com.sun.j3d.utils.behaviors.mouse;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.event.MouseEvent;
+import java.util.Enumeration;
+
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOnBehaviorPost;
+import javax.vecmath.Vector3d;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java
index 684f97b..7bbd0bc 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/Intersect.java
@@ -44,9 +44,14 @@
 
 package com.sun.j3d.utils.behaviors.picking;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.lang.Math;
+import javax.media.j3d.PickPoint;
+import javax.media.j3d.PickRay;
+import javax.media.j3d.PickSegment;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Tuple3d;
+import javax.vecmath.Vector3d;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /*
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java
index 68c09f3..d8d4a3c 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickMouseBehavior.java
@@ -44,11 +44,19 @@
 
 package com.sun.j3d.utils.behaviors.picking;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.awt.AWTEvent;
+import java.awt.Event;
+import java.awt.event.MouseEvent;
+import java.util.Enumeration;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOr;
 
 
 /*
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java
index 4ffad61..191e947 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickObject.java
@@ -83,12 +83,24 @@ Misc:
 
 package com.sun.j3d.utils.behaviors.picking;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Group;
+import javax.media.j3d.Link;
+import javax.media.j3d.Morph;
+import javax.media.j3d.Node;
+import javax.media.j3d.PickRay;
+import javax.media.j3d.PickShape;
+import javax.media.j3d.SceneGraphPath;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Switch;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.View;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
+
 import com.sun.j3d.utils.geometry.Primitive;
-import javax.vecmath.*;
 
 /*
  * Contains methods to aid in picking.  A PickObject is created
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java
index b615d4a..396bc3c 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickRotateBehavior.java
@@ -44,12 +44,14 @@
 
 package com.sun.j3d.utils.behaviors.picking;
 
-import com.sun.j3d.utils.behaviors.mouse.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
 
 /*
  * A mouse behavior that allows user to pick and drag scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java
index 9771d6a..7d72223 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickTranslateBehavior.java
@@ -44,12 +44,15 @@
 
 package com.sun.j3d.utils.behaviors.picking;
 
-import com.sun.j3d.utils.behaviors.mouse.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
 
 // A mouse behavior that allows user to pick and translate scene graph objects.
 // Common usage: 1. Create your scene graph. 2. Create this behavior with
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java
index ca6e86d..0e9e542 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/picking/PickZoomBehavior.java
@@ -44,12 +44,15 @@
 
 package com.sun.j3d.utils.behaviors.picking;
 
-import com.sun.j3d.utils.behaviors.mouse.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
 
 
 // A mouse behavior that allows user to pick and zoom scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
index 3e01bb6..025f1e8 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/Mouse6DPointerBehavior.java
@@ -44,10 +44,17 @@
 
 package com.sun.j3d.utils.behaviors.sensor ;
 
-import java.util.Enumeration ;
-import javax.media.j3d.* ;
-import javax.vecmath.Point3d ;
-import javax.vecmath.Vector3f ;
+import java.util.Enumeration;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.Sensor;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCondition;
+import javax.media.j3d.WakeupOnElapsedFrames;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3f;
 
 /**
  * This class provides basic behavior for a 6DOF mouse sensor.  It
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java
index fa95846..dea9ac2 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorBeamEcho.java
@@ -44,17 +44,17 @@
 
 package com.sun.j3d.utils.behaviors.sensor ;
 
-import javax.media.j3d.Shape3D ;
-import javax.media.j3d.Material ;
-import javax.media.j3d.Appearance ;
-import javax.media.j3d.Transform3D ;
-import javax.media.j3d.GeometryArray ;
-import javax.media.j3d.TriangleStripArray ;
+import javax.media.j3d.Appearance;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.Material;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransparencyAttributes;
-import javax.vecmath.AxisAngle4f ;
-import javax.vecmath.Point3d ;
-import javax.vecmath.Point3f ;
-import javax.vecmath.Vector3f ;
+import javax.media.j3d.TriangleStripArray;
+import javax.vecmath.AxisAngle4f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
 
 /**
  * A Shape3D representing a beam pointing from the origin of a
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java
index 76d5c44..15e47b4 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEvent.java
@@ -44,8 +44,8 @@
 
 package com.sun.j3d.utils.behaviors.sensor ;
 
-import javax.media.j3d.Sensor ;
-import javax.media.j3d.Transform3D ;
+import javax.media.j3d.Sensor;
+import javax.media.j3d.Transform3D;
 
 /**
  * This class defines the event object that is created by a
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java
index 285a222..833eda8 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorEventAgent.java
@@ -44,12 +44,14 @@
 
 package com.sun.j3d.utils.behaviors.sensor ;
 
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.ArrayList ;
-import javax.media.j3d.Sensor ;
-import javax.media.j3d.Transform3D ;
-import com.sun.j3d.utils.timer.J3DTimer ;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.media.j3d.Sensor;
+import javax.media.j3d.Transform3D;
+
+import com.sun.j3d.utils.timer.J3DTimer;
 
 /**
  * This class works in conjunction with the <code>SensorButtonListener</code>
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java
index eac90cb..33cbe5b 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/sensor/SensorGnomonEcho.java
@@ -44,15 +44,15 @@
 
 package com.sun.j3d.utils.behaviors.sensor ;
 
-import javax.media.j3d.Shape3D ;
-import javax.media.j3d.Material ;
-import javax.media.j3d.Appearance ;
-import javax.media.j3d.Transform3D ;
-import javax.media.j3d.GeometryArray ;
-import javax.media.j3d.TriangleArray ;
+import javax.media.j3d.Appearance;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.Material;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransparencyAttributes;
-import javax.vecmath.Point3f ;
-import javax.vecmath.Vector3f ;
+import javax.media.j3d.TriangleArray;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
 
 /**
  * A Shape3D representing a gnomon pointing along each coordinate
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java
index 00d68f4..a0f1495 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/vp/OrbitBehavior.java
@@ -44,19 +44,17 @@
 
 package com.sun.j3d.utils.behaviors.vp;
 
-import java.awt.event.MouseEvent;
 import java.awt.AWTEvent;
+import java.awt.event.MouseEvent;
 
-import javax.media.j3d.Transform3D;
 import javax.media.j3d.Canvas3D;
-
-import javax.vecmath.Vector3d;
-import javax.vecmath.Point3d;
+import javax.media.j3d.Transform3D;
 import javax.vecmath.Matrix3d;
-
-import com.sun.j3d.utils.universe.ViewingPlatform;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
 
 import com.sun.j3d.internal.J3dUtilsI18N;
+import com.sun.j3d.utils.universe.ViewingPlatform;
 
 /**
  * Moves the View around a point of interest when the mouse is dragged with
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
index 00b3afd..d803658 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformAWTBehavior.java
@@ -44,31 +44,22 @@
 
 package com.sun.j3d.utils.behaviors.vp;
 
-import java.awt.event.ComponentEvent;
+import java.awt.AWTEvent;
+import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.awt.event.MouseWheelListener;
 import java.awt.event.MouseMotionListener;
-import java.awt.event.KeyListener;
-import java.awt.event.KeyEvent;
-import java.awt.AWTEvent;
-import java.awt.Component;
-import java.awt.Cursor;
-import javax.swing.SwingUtilities;
+import java.awt.event.MouseWheelListener;
 import java.util.ArrayList;
 
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.WakeupCondition;
 import javax.media.j3d.WakeupOnBehaviorPost;
 import javax.media.j3d.WakeupOnElapsedFrames;
-import javax.media.j3d.WakeupOr;
-import javax.media.j3d.WakeupCriterion;
-import javax.media.j3d.WakeupCondition;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.View;
-import javax.media.j3d.Canvas3D;
 
-import javax.vecmath.Vector3f;
-import com.sun.j3d.utils.universe.*;
+import com.sun.j3d.utils.universe.Viewer;
+import com.sun.j3d.utils.universe.ViewingPlatform;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java
index 5cc2f83..53ad9c9 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/vp/ViewPlatformBehavior.java
@@ -44,9 +44,11 @@
 
 package com.sun.j3d.utils.behaviors.vp;
 
-import javax.vecmath.*;
-import javax.media.j3d.*;
-import com.sun.j3d.utils.universe.*;
+import javax.media.j3d.Behavior;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.universe.ViewingPlatform;
 
 /**
  * Abstract class for ViewPlatformBehaviors.  A ViewPlatformBehavior must
diff --git a/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java b/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java
index 1d4d4ed..3f63b4f 100644
--- a/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/behaviors/vp/WandViewBehavior.java
@@ -44,11 +44,42 @@
 
 package com.sun.j3d.utils.behaviors.vp ;
 
-import java.util.* ;
-import javax.vecmath.* ;
-import javax.media.j3d.* ;
-import com.sun.j3d.utils.universe.* ;
-import com.sun.j3d.utils.behaviors.sensor.* ;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Map;
+
+import javax.media.j3d.Appearance;
+import javax.media.j3d.BadTransformException;
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Group;
+import javax.media.j3d.Material;
+import javax.media.j3d.Sensor;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.TransparencyAttributes;
+import javax.media.j3d.View;
+import javax.media.j3d.WakeupCondition;
+import javax.media.j3d.WakeupOnElapsedFrames;
+import javax.vecmath.AxisAngle4d;
+import javax.vecmath.Color3f;
+import javax.vecmath.Matrix3d;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
+
+import com.sun.j3d.utils.behaviors.sensor.SensorBeamEcho;
+import com.sun.j3d.utils.behaviors.sensor.SensorButtonListener;
+import com.sun.j3d.utils.behaviors.sensor.SensorEvent;
+import com.sun.j3d.utils.behaviors.sensor.SensorEventAgent;
+import com.sun.j3d.utils.behaviors.sensor.SensorGnomonEcho;
+import com.sun.j3d.utils.behaviors.sensor.SensorInputAdaptor;
+import com.sun.j3d.utils.behaviors.sensor.SensorReadListener;
+import com.sun.j3d.utils.universe.ConfiguredUniverse;
+import com.sun.j3d.utils.universe.SimpleUniverse;
+import com.sun.j3d.utils.universe.Viewer;
+import com.sun.j3d.utils.universe.ViewingPlatform;
 
 /**
  * Manipulates view platform transforms using a motion-tracked wand or mouse
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java b/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java
index 8019053..0d23d7d 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java
+++ b/src/classes/share/com/sun/j3d/utils/compression/CompressedGeometryFile.java
@@ -47,6 +47,8 @@ package com.sun.j3d.utils.compression;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+
+import javax.media.j3d.CapabilityNotSetException;
 import javax.media.j3d.CompressedGeometry;
 import javax.media.j3d.CompressedGeometryHeader;
 
diff --git a/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java b/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java
index d1619b7..0d1ba44 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java
+++ b/src/classes/share/com/sun/j3d/utils/compression/CompressionStream.java
@@ -44,14 +44,10 @@
 
 package com.sun.j3d.utils.compression;
 
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.internal.ByteBufferWrapper;
-import com.sun.j3d.internal.DoubleBufferWrapper;
-import com.sun.j3d.internal.FloatBufferWrapper;
-import com.sun.j3d.utils.geometry.GeometryInfo;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
+
 import javax.media.j3d.Appearance;
 import javax.media.j3d.CompressedGeometryHeader;
 import javax.media.j3d.Geometry;
@@ -81,6 +77,12 @@ import javax.vecmath.Point3f;
 import javax.vecmath.Point3i;
 import javax.vecmath.Vector3f;
 
+import com.sun.j3d.internal.BufferWrapper;
+import com.sun.j3d.internal.ByteBufferWrapper;
+import com.sun.j3d.internal.DoubleBufferWrapper;
+import com.sun.j3d.internal.FloatBufferWrapper;
+import com.sun.j3d.utils.geometry.GeometryInfo;
+
 /**
  * This class is used as input to a geometry compressor.  It collects elements
  * such as vertices, normals, colors, mesh references, and quantization
diff --git a/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java b/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java
index 58ed898..ccfb85b 100644
--- a/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java
+++ b/src/classes/share/com/sun/j3d/utils/compression/GeometryCompressor.java
@@ -45,6 +45,7 @@
 package com.sun.j3d.utils.compression;
 
 import java.io.IOException;
+
 import javax.media.j3d.CompressedGeometry;
 import javax.media.j3d.CompressedGeometryHeader;
 import javax.vecmath.Point3d;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/BBox.java b/src/classes/share/com/sun/j3d/utils/geometry/BBox.java
index 2389a0b..ec32f36 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/BBox.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/BBox.java
@@ -59,9 +59,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
 
 /**
  * Bounding Box class for Triangulator.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Basic.java b/src/classes/share/com/sun/j3d/utils/geometry/Basic.java
index 3e5147e..53728a3 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Basic.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Basic.java
@@ -59,9 +59,8 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Tuple2f;
+import javax.vecmath.Tuple3f;
 
 class Basic {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java b/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java
index 035f98d..df5a8ea 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/BottleNeck.java
@@ -59,9 +59,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
 
 class BottleNeck {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Box.java b/src/classes/share/com/sun/j3d/utils/geometry/Box.java
index 2403111..69ee2d7 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Box.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Box.java
@@ -44,9 +44,11 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Appearance;
+import javax.media.j3d.Node;
+import javax.media.j3d.NodeComponent;
+import javax.media.j3d.Shape3D;
+import javax.vecmath.Vector3f;
 
 /**
  * Box is a geometry primitive created with a given length, width, and height.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java b/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java
index 19c9fdf..8589538 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Bridge.java
@@ -59,9 +59,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
 
 class Bridge {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Clean.java b/src/classes/share/com/sun/j3d/utils/geometry/Clean.java
index 40d42e5..9f2fbd8 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Clean.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Clean.java
@@ -59,9 +59,7 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Point2f;
 
 class Clean {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java b/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java
index 4014607..d7b54eb 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/ColorCube.java
@@ -44,7 +44,8 @@
 
 package com.sun.j3d.utils.geometry;
 
-import javax.media.j3d.*;
+import javax.media.j3d.QuadArray;
+import javax.media.j3d.Shape3D;
 
 /**
  * Simple color-per-vertex cube with a different color for each face
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Cone.java b/src/classes/share/com/sun/j3d/utils/geometry/Cone.java
index d10355a..15f7451 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Cone.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Cone.java
@@ -44,11 +44,10 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.*;
-import java.io.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Appearance;
+import javax.media.j3d.Node;
+import javax.media.j3d.NodeComponent;
+import javax.media.j3d.Shape3D;
 
 /**
  * Cone is a geometry primitive defined with a radius and a height.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java b/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java
index 92071b7..3860aa7 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Cylinder.java
@@ -44,11 +44,10 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.*;
-import java.io.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Appearance;
+import javax.media.j3d.Node;
+import javax.media.j3d.NodeComponent;
+import javax.media.j3d.Shape3D;
 
 /**
  * Cylinder is a geometry primitive defined with a radius and a height.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java b/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java
index 2b50a9b..f6fa96f 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Degenerate.java
@@ -59,9 +59,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
 
 class Degenerate {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java b/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java
index 86aab2c..19e0bb0 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Desperate.java
@@ -59,9 +59,7 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Point2f;
 
 class Desperate {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/EarClip.java b/src/classes/share/com/sun/j3d/utils/geometry/EarClip.java
index 67794a6..874bc8c 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/EarClip.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/EarClip.java
@@ -59,9 +59,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
 
 class EarClip {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/EdgeTable.java b/src/classes/share/com/sun/j3d/utils/geometry/EdgeTable.java
index 625283a..9b033b3 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/EdgeTable.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/EdgeTable.java
@@ -46,8 +46,6 @@ package com.sun.j3d.utils.geometry;
 
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Set;
-import com.sun.j3d.utils.geometry.Edge;
 
 class EdgeTable {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java b/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java
index b5eba47..6726f1c 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/GeomBuffer.java
@@ -44,12 +44,15 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.*;
-import java.io.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.math.*;
+import javax.media.j3d.Geometry;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.QuadArray;
+import javax.media.j3d.TriangleArray;
+import javax.media.j3d.TriangleFanArray;
+import javax.media.j3d.TriangleStripArray;
+import javax.vecmath.Point3f;
+import javax.vecmath.TexCoord2f;
+import javax.vecmath.Vector3f;
 
 /**
  * GeomBuffer allows OpenGL-like input of geometry data. It outputs
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java b/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java
index 7a51f03..4531411 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfo.java
@@ -44,19 +44,37 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.Triangulator;
-import java.io.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import com.sun.j3d.internal.J3dUtilsI18N;
 import java.util.HashMap;
-import com.sun.j3d.utils.geometry.GeometryInfoGenerator;
-import com.sun.j3d.internal.BufferWrapper;
+
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.IndexedGeometryArray;
+import javax.media.j3d.IndexedQuadArray;
+import javax.media.j3d.IndexedTriangleArray;
+import javax.media.j3d.IndexedTriangleFanArray;
+import javax.media.j3d.IndexedTriangleStripArray;
+import javax.media.j3d.QuadArray;
+import javax.media.j3d.TriangleArray;
+import javax.media.j3d.TriangleFanArray;
+import javax.media.j3d.TriangleStripArray;
+import javax.vecmath.Color3b;
+import javax.vecmath.Color3f;
+import javax.vecmath.Color4b;
+import javax.vecmath.Color4f;
+import javax.vecmath.Point2f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.TexCoord2f;
+import javax.vecmath.TexCoord3f;
+import javax.vecmath.TexCoord4f;
+import javax.vecmath.Tuple2f;
+import javax.vecmath.Tuple3f;
+import javax.vecmath.Tuple4f;
+import javax.vecmath.Vector3f;
+
 import com.sun.j3d.internal.ByteBufferWrapper;
-import com.sun.j3d.internal.FloatBufferWrapper;
-import com.sun.j3d.internal.DoubleBufferWrapper;
 import com.sun.j3d.internal.ByteOrderWrapper;
-import javax.media.j3d.J3DBuffer;
+import com.sun.j3d.internal.FloatBufferWrapper;
+import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
  * The GeometryInfo object holds data for processing by the Java3D geometry
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java b/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java
index e4a6108..89b4cba 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/GeometryInfoGenerator.java
@@ -46,24 +46,33 @@ package com.sun.j3d.utils.geometry;
 
 import javax.media.j3d.GeometryArray;
 import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.TriangleFanArray;
-import javax.media.j3d.TriangleStripArray;
-import javax.media.j3d.TriangleArray;
-import javax.media.j3d.QuadArray;
 import javax.media.j3d.IndexedGeometryArray;
 import javax.media.j3d.IndexedGeometryStripArray;
 import javax.media.j3d.IndexedQuadArray;
 import javax.media.j3d.IndexedTriangleArray;
 import javax.media.j3d.IndexedTriangleFanArray;
 import javax.media.j3d.IndexedTriangleStripArray;
-import javax.vecmath.*;
-import com.sun.j3d.utils.geometry.GeometryInfo;
-import com.sun.j3d.internal.J3dUtilsI18N;
+import javax.media.j3d.J3DBuffer;
+import javax.media.j3d.QuadArray;
+import javax.media.j3d.TriangleArray;
+import javax.media.j3d.TriangleFanArray;
+import javax.media.j3d.TriangleStripArray;
+import javax.vecmath.Color3b;
+import javax.vecmath.Color3f;
+import javax.vecmath.Color4b;
+import javax.vecmath.Color4f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.TexCoord2f;
+import javax.vecmath.TexCoord3f;
+import javax.vecmath.TexCoord4f;
+import javax.vecmath.Vector3f;
+
 import com.sun.j3d.internal.BufferWrapper;
 import com.sun.j3d.internal.ByteBufferWrapper;
-import com.sun.j3d.internal.FloatBufferWrapper;
 import com.sun.j3d.internal.DoubleBufferWrapper;
-import javax.media.j3d.J3DBuffer;
+import com.sun.j3d.internal.FloatBufferWrapper;
+import com.sun.j3d.internal.J3dUtilsI18N;
 
 
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Heap.java b/src/classes/share/com/sun/j3d/utils/geometry/Heap.java
index 47c1738..753c545 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Heap.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Heap.java
@@ -59,9 +59,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
 
 class Heap {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/NoHash.java b/src/classes/share/com/sun/j3d/utils/geometry/NoHash.java
index a65a2b1..b6fc9f9 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/NoHash.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/NoHash.java
@@ -59,9 +59,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
 
 class NoHash {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java b/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java
index 8c0ff88..6ae7e32 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/NormalGenerator.java
@@ -44,11 +44,10 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.GeometryInfo;
-import com.sun.j3d.utils.geometry.EdgeTable;
 import java.util.ArrayList;
-import javax.vecmath.Vector3f;
+
 import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
 
 /**
  * The NormalGenerator utility will calculate and fill in the normals
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java b/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java
index 950d0c3..fd33516 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Numerics.java
@@ -59,9 +59,8 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Point2f;
+import javax.vecmath.Tuple2f;
 
 class Numerics {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java b/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java
index 96549da..71d930a 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Orientation.java
@@ -59,9 +59,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
 
 class Orientation {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java b/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java
index 96bcd9d..240fbdf 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Primitive.java
@@ -44,12 +44,13 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.*;
-import java.io.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.math.*;
+import java.util.Hashtable;
+
+import javax.media.j3d.Appearance;
+import javax.media.j3d.Group;
+import javax.media.j3d.Material;
+import javax.media.j3d.Shape3D;
+import javax.vecmath.Color3f;
 
 /**
  * Base class for all Java 3D primitives. By default all primitives
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Project.java b/src/classes/share/com/sun/j3d/utils/geometry/Project.java
index 05ecd5d..958be83 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Project.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Project.java
@@ -59,9 +59,10 @@
 
 package com.sun.j3d.utils.geometry;
 
-import javax.vecmath.*;
-import java.io.*;
-import java.util.*;
+import javax.vecmath.Matrix4f;
+import javax.vecmath.Point3f;
+import javax.vecmath.Tuple3f;
+import javax.vecmath.Vector3f;
 
 class Project  {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java b/src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java
index ab81ac6..d43c4d5 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Quadrics.java
@@ -44,12 +44,6 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.*;
-import java.io.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.math.*;
 
 class Quadrics extends Object {
 
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Simple.java b/src/classes/share/com/sun/j3d/utils/geometry/Simple.java
index 5da6aad..ab528d9 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Simple.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Simple.java
@@ -59,9 +59,7 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import java.util.*;
-import javax.vecmath.*;
+import javax.vecmath.Point3f;
 
 
 class Simple {
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java b/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java
index 43afd08..306dd84 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Sphere.java
@@ -44,12 +44,13 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.*;
-import java.io.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.math.*;
+import javax.media.j3d.Appearance;
+import javax.media.j3d.Node;
+import javax.media.j3d.NodeComponent;
+import javax.media.j3d.Shape3D;
+import javax.vecmath.Point3f;
+import javax.vecmath.TexCoord2f;
+import javax.vecmath.Vector3f;
 
 /**
  * Sphere is a geometry primitive created with a given radius and resolution.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java b/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java
index a1b65d6..a7c048a 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Stripifier.java
@@ -59,9 +59,8 @@
 
 package com.sun.j3d.utils.geometry;
 
-import com.sun.j3d.utils.geometry.GeometryInfo;
-import java.util.LinkedList;
 import java.util.ArrayList;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java b/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java
index 0537494..052c376 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Text2D.java
@@ -44,13 +44,13 @@
 
 package com.sun.j3d.utils.geometry;
 
-import java.awt.image.BufferedImage;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Toolkit;
+import java.awt.image.BufferedImage;
 import java.util.Hashtable;
 
 import javax.media.j3d.Appearance;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java b/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java
index c4a8489..26b281d 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/Triangulator.java
@@ -59,9 +59,12 @@
 
 package com.sun.j3d.utils.geometry;
 
-import javax.vecmath.*;
-import java.util.*;
-import com.sun.j3d.utils.geometry.GeometryInfo;
+import java.util.Random;
+
+import javax.vecmath.Point2f;
+import javax.vecmath.Point3f;
+import javax.vecmath.Vector3f;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java
index 4d8b494..d39b734 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryData.java
@@ -44,11 +44,13 @@
 
 package com.sun.j3d.utils.geometry.compression;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import javax.media.j3d.Canvas3D;
 import javax.media.j3d.J3DBuffer;
 import javax.media.j3d.Shape3D;
 import javax.vecmath.Point3d;
 
+import com.sun.j3d.internal.J3dUtilsI18N;
+
 /**
  * The compressed geometry object is used to store geometry in a
  * compressed format. Using compressed geometry may increase the speed
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java
index d9c07d7..5c51453 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryFile.java
@@ -48,6 +48,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import javax.media.j3d.CapabilityNotSetException;
+
 //
 // The compressed geometry file format supported by this class has a 32
 // byte header followed by multiple compressed geometry objects.
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java
index d5b78df..3d47e34 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressedGeometryRetained.java
@@ -45,13 +45,7 @@
 package com.sun.j3d.utils.geometry.compression;
 
 import javax.media.j3d.BoundingBox;
-import javax.media.j3d.Bounds;
-import javax.media.j3d.Canvas3D;
 import javax.media.j3d.GeometryArray;
-import javax.media.j3d.PickInfo;
-import javax.media.j3d.PickShape;
-import javax.media.j3d.Transform3D;
-import javax.vecmath.Point3d;
 
 /**
  * The compressed geometry object is used to store geometry in a
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java
index d257ea8..45fceaf 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/CompressionStream.java
@@ -44,14 +44,10 @@
 
 package com.sun.j3d.utils.geometry.compression;
 
-import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.internal.ByteBufferWrapper;
-import com.sun.j3d.internal.DoubleBufferWrapper;
-import com.sun.j3d.internal.FloatBufferWrapper;
-import com.sun.j3d.utils.geometry.GeometryInfo;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
+
 import javax.media.j3d.Appearance;
 import javax.media.j3d.Geometry;
 import javax.media.j3d.GeometryArray;
@@ -80,6 +76,12 @@ import javax.vecmath.Point3f;
 import javax.vecmath.Point3i;
 import javax.vecmath.Vector3f;
 
+import com.sun.j3d.internal.BufferWrapper;
+import com.sun.j3d.internal.ByteBufferWrapper;
+import com.sun.j3d.internal.DoubleBufferWrapper;
+import com.sun.j3d.internal.FloatBufferWrapper;
+import com.sun.j3d.utils.geometry.GeometryInfo;
+
 /**
  * This class is used as input to a geometry compressor.  It collects elements
  * such as vertices, normals, colors, mesh references, and quantization
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java
index 5f6a6e8..7e0d3ca 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeneralizedVertexList.java
@@ -45,6 +45,7 @@
 package com.sun.j3d.utils.geometry.compression;
 
 import java.util.ArrayList;
+
 import javax.media.j3d.GeometryArray;
 import javax.media.j3d.GeometryStripArray;
 import javax.media.j3d.LineStripArray;
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java
index 3309e9b..9c5ba5f 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryCompressor.java
@@ -45,6 +45,7 @@
 package com.sun.j3d.utils.geometry.compression;
 
 import java.io.IOException;
+
 import javax.vecmath.Point3d;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java
index d05bf67..7cd21c4 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressor.java
@@ -44,11 +44,13 @@
 
 package com.sun.j3d.utils.geometry.compression;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
+import javax.media.j3d.CompressedGeometryHeader;
 import javax.vecmath.Color4f;
 import javax.vecmath.Point3f;
 import javax.vecmath.Vector3f;
 
+import com.sun.j3d.internal.J3dUtilsI18N;
+
 /**
  * This abstract class provides the base methods needed to create a geometry
  * decompressor.  Subclasses must implement a backend to handle the output,
diff --git a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java
index ba7c38e..ace3fb5 100644
--- a/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java
+++ b/src/classes/share/com/sun/j3d/utils/geometry/compression/GeometryDecompressorShape3D.java
@@ -44,9 +44,10 @@
 
 package com.sun.j3d.utils.geometry.compression;
 
-import com.sun.j3d.internal.J3dUtilsI18N;
 import java.util.ArrayList;
+
 import javax.media.j3d.Appearance;
+import javax.media.j3d.CompressedGeometry;
 import javax.media.j3d.GeometryArray;
 import javax.media.j3d.GeometryStripArray;
 import javax.media.j3d.LineStripArray;
@@ -59,6 +60,8 @@ import javax.vecmath.Color4f;
 import javax.vecmath.Point3f;
 import javax.vecmath.Vector3f;
 
+import com.sun.j3d.internal.J3dUtilsI18N;
+
 /**
  * This class implements a Shape3D backend for the abstract
  * GeometryDecompressor.
diff --git a/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java b/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java
index 0609636..62b994f 100644
--- a/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java
+++ b/src/classes/share/com/sun/j3d/utils/image/TextureLoader.java
@@ -44,18 +44,30 @@
 
 package com.sun.j3d.utils.image;
 
-import javax.media.j3d.*;
-import java.awt.Image;
 import java.awt.Component;
+import java.awt.Image;
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
 import java.awt.geom.AffineTransform;
-import java.awt.image.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.ImageObserver;
+import java.awt.image.PixelInterleavedSampleModel;
+import java.awt.image.RenderedImage;
+import java.awt.image.SampleModel;
+import java.awt.image.WritableRaster;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.lang.reflect.Method;
+
 import javax.imageio.ImageIO;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.ImageComponent;
+import javax.media.j3d.ImageComponent2D;
+import javax.media.j3d.Texture;
+import javax.media.j3d.Texture2D;
 
 /**
  * This class is used for loading a texture from an Image or BufferedImage.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java b/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java
index 72b184b..e52d5a0 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java
+++ b/src/classes/share/com/sun/j3d/utils/pickfast/PickCanvas.java
@@ -44,10 +44,19 @@
 
 package com.sun.j3d.utils.pickfast;
 
-import java.awt.event.*;
-import javax.vecmath.*;
-import javax.media.j3d.*;
-import com.sun.j3d.utils.geometry.*; // Cone, Cylinder
+import java.awt.event.MouseEvent;
+
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Locale;
+import javax.media.j3d.PickConeRay;
+import javax.media.j3d.PickCylinderRay;
+import javax.media.j3d.PickRay;
+import javax.media.j3d.PickShape;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.View;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
 
 /**
  * A subclass of PickTool, simplifies picking using mouse events from a canvas.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java b/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java
index 5436eae..903ac1d 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java
+++ b/src/classes/share/com/sun/j3d/utils/pickfast/PickIntersection.java
@@ -44,9 +44,17 @@
 
 package com.sun.j3d.utils.pickfast;
 
-import javax.vecmath.*;
-import javax.media.j3d.*;
-import com.sun.j3d.utils.geometry.Primitive;
+import javax.media.j3d.Geometry;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.IndexedGeometryArray;
+import javax.media.j3d.PickInfo;
+import javax.media.j3d.Transform3D;
+import javax.vecmath.Color3f;
+import javax.vecmath.Color4f;
+import javax.vecmath.Point3d;
+import javax.vecmath.TexCoord3f;
+import javax.vecmath.Vector3d;
+import javax.vecmath.Vector3f;
 
 /**
  * Holds information about an intersection of a PickShape with a Node
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java b/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java
index b629e6b..c59cf43 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java
+++ b/src/classes/share/com/sun/j3d/utils/pickfast/PickTool.java
@@ -44,10 +44,30 @@
 
 package com.sun.j3d.utils.pickfast;
 
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Group;
+import javax.media.j3d.Link;
+import javax.media.j3d.Locale;
+import javax.media.j3d.Morph;
+import javax.media.j3d.Node;
+import javax.media.j3d.PickBounds;
+import javax.media.j3d.PickConeRay;
+import javax.media.j3d.PickConeSegment;
+import javax.media.j3d.PickCylinderRay;
+import javax.media.j3d.PickCylinderSegment;
+import javax.media.j3d.PickInfo;
+import javax.media.j3d.PickRay;
+import javax.media.j3d.PickSegment;
+import javax.media.j3d.PickShape;
+import javax.media.j3d.SceneGraphPath;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Switch;
+import javax.media.j3d.TransformGroup;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
+
 import com.sun.j3d.utils.geometry.Primitive;
-import javax.vecmath.*;
-import javax.media.j3d.*;
-import com.sun.j3d.internal.*;
 
 /**
  * The base class for optimized picking operations.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java
index 886ef20..d2ba3b3 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickMouseBehavior.java
@@ -44,13 +44,22 @@
 
 package com.sun.j3d.utils.pickfast.behaviors;
 
-import com.sun.j3d.utils.pickfast.*;
-import com.sun.j3d.internal.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.awt.AWTEvent;
+import java.awt.Event;
+import java.awt.event.MouseEvent;
+import java.util.Enumeration;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOr;
+
+import com.sun.j3d.utils.pickfast.PickCanvas;
+import com.sun.j3d.utils.pickfast.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java
index 64fff73..860a97e 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickRotateBehavior.java
@@ -44,14 +44,16 @@
 
 package com.sun.j3d.utils.pickfast.behaviors;
 
-import com.sun.j3d.utils.pickfast.*;
-import com.sun.j3d.utils.behaviors.mouse.*;
-import com.sun.j3d.internal.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.PickInfo;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
+import com.sun.j3d.utils.pickfast.PickTool;
 
 /**
  * A mouse behavior that allows user to pick and rotate scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java
index 8d5ba47..4ca98f0 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickTranslateBehavior.java
@@ -44,13 +44,17 @@
 
 package com.sun.j3d.utils.pickfast.behaviors;
 
-import com.sun.j3d.utils.pickfast.*;
-import com.sun.j3d.utils.behaviors.mouse.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.PickInfo;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
+import com.sun.j3d.utils.pickfast.PickTool;
 
 /**
  * A mouse behavior that allows user to pick and translate scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java
index 1db8d16..bf15e7c 100644
--- a/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/pickfast/behaviors/PickZoomBehavior.java
@@ -44,13 +44,17 @@
 
 package com.sun.j3d.utils.pickfast.behaviors;
 
-import com.sun.j3d.utils.pickfast.*;
-import com.sun.j3d.utils.behaviors.mouse.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.PickInfo;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
+import com.sun.j3d.utils.pickfast.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java b/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java
index efe7708..7306032 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java
+++ b/src/classes/share/com/sun/j3d/utils/picking/PickCanvas.java
@@ -44,10 +44,19 @@
 
 package com.sun.j3d.utils.picking;
 
-import java.awt.event.*;
-import javax.vecmath.*;
-import javax.media.j3d.*;
-import com.sun.j3d.utils.geometry.*; // Cone, Cylinder
+import java.awt.event.MouseEvent;
+
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Locale;
+import javax.media.j3d.PickConeRay;
+import javax.media.j3d.PickCylinderRay;
+import javax.media.j3d.PickRay;
+import javax.media.j3d.PickShape;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.View;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
 
 /**
  * A subclass of PickTool, simplifies picking using mouse events from a canvas.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java b/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java
index 756e126..4abfb2a 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java
+++ b/src/classes/share/com/sun/j3d/utils/picking/PickIntersection.java
@@ -44,9 +44,18 @@
 
 package com.sun.j3d.utils.picking;
 
-import javax.vecmath.*;
-import javax.media.j3d.*;
-import com.sun.j3d.utils.geometry.Primitive;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.IndexedGeometryArray;
+import javax.vecmath.Color3b;
+import javax.vecmath.Color3f;
+import javax.vecmath.Color4b;
+import javax.vecmath.Color4f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.TexCoord2f;
+import javax.vecmath.TexCoord3f;
+import javax.vecmath.Vector3d;
+import javax.vecmath.Vector3f;
 
 /**
  * Holds information about an intersection of a PickShape with a Node
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickResult.java b/src/classes/share/com/sun/j3d/utils/picking/PickResult.java
index 71a29c6..e4dd441 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickResult.java
+++ b/src/classes/share/com/sun/j3d/utils/picking/PickResult.java
@@ -44,11 +44,61 @@
 
 package com.sun.j3d.utils.picking;
 
-import javax.vecmath.*;
-import javax.media.j3d.*;
 import java.util.ArrayList;
+
+import javax.media.j3d.BoundingBox;
+import javax.media.j3d.BoundingPolytope;
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.CompressedGeometry;
+import javax.media.j3d.Geometry;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.Group;
+import javax.media.j3d.IndexedGeometryArray;
+import javax.media.j3d.IndexedLineArray;
+import javax.media.j3d.IndexedLineStripArray;
+import javax.media.j3d.IndexedPointArray;
+import javax.media.j3d.IndexedQuadArray;
+import javax.media.j3d.IndexedTriangleArray;
+import javax.media.j3d.IndexedTriangleFanArray;
+import javax.media.j3d.IndexedTriangleStripArray;
+import javax.media.j3d.LineArray;
+import javax.media.j3d.LineStripArray;
+import javax.media.j3d.Link;
+import javax.media.j3d.Morph;
+import javax.media.j3d.Node;
+import javax.media.j3d.PickBounds;
+import javax.media.j3d.PickCone;
+import javax.media.j3d.PickConeRay;
+import javax.media.j3d.PickConeSegment;
+import javax.media.j3d.PickCylinder;
+import javax.media.j3d.PickCylinderRay;
+import javax.media.j3d.PickCylinderSegment;
+import javax.media.j3d.PickPoint;
+import javax.media.j3d.PickRay;
+import javax.media.j3d.PickSegment;
+import javax.media.j3d.PickShape;
+import javax.media.j3d.PointArray;
+import javax.media.j3d.QuadArray;
+import javax.media.j3d.SceneGraphPath;
+import javax.media.j3d.Shape3D;
+import javax.media.j3d.Switch;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.TriangleArray;
+import javax.media.j3d.TriangleFanArray;
+import javax.media.j3d.TriangleStripArray;
+import javax.vecmath.Point2d;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.Point4d;
+import javax.vecmath.Tuple3d;
+import javax.vecmath.Vector3d;
+import javax.vecmath.Vector4d;
+
+import com.sun.j3d.internal.Distance;
 import com.sun.j3d.utils.geometry.Primitive;
-import com.sun.j3d.internal.*;
 
 /**
  * Stores information about a pick hit.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/PickTool.java b/src/classes/share/com/sun/j3d/utils/picking/PickTool.java
index c4d131c..706f25a 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/PickTool.java
+++ b/src/classes/share/com/sun/j3d/utils/picking/PickTool.java
@@ -44,9 +44,27 @@
 
 package com.sun.j3d.utils.picking;
 
-import javax.vecmath.*;
-import javax.media.j3d.*;
-import com.sun.j3d.internal.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.CompressedGeometry;
+import javax.media.j3d.Geometry;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.IndexedGeometryArray;
+import javax.media.j3d.Locale;
+import javax.media.j3d.Morph;
+import javax.media.j3d.Node;
+import javax.media.j3d.PickBounds;
+import javax.media.j3d.PickConeRay;
+import javax.media.j3d.PickConeSegment;
+import javax.media.j3d.PickCylinderRay;
+import javax.media.j3d.PickCylinderSegment;
+import javax.media.j3d.PickRay;
+import javax.media.j3d.PickSegment;
+import javax.media.j3d.PickShape;
+import javax.media.j3d.SceneGraphPath;
+import javax.media.j3d.Shape3D;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
 
 /**
  * The base class for picking operations.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java
index 6c8af73..c12ddf2 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickMouseBehavior.java
@@ -44,13 +44,22 @@
 
 package com.sun.j3d.utils.picking.behaviors;
 
-import com.sun.j3d.utils.picking.*;
-import com.sun.j3d.internal.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import java.awt.AWTEvent;
+import java.awt.Event;
+import java.awt.event.MouseEvent;
+import java.util.Enumeration;
+
+import javax.media.j3d.Behavior;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.WakeupCriterion;
+import javax.media.j3d.WakeupOnAWTEvent;
+import javax.media.j3d.WakeupOr;
+
+import com.sun.j3d.utils.picking.PickCanvas;
+import com.sun.j3d.utils.picking.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java
index 958d609..e616192 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickRotateBehavior.java
@@ -44,14 +44,16 @@
 
 package com.sun.j3d.utils.picking.behaviors;
 
-import com.sun.j3d.utils.picking.*;
-import com.sun.j3d.utils.behaviors.mouse.*;
-import com.sun.j3d.internal.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
+import com.sun.j3d.utils.picking.PickResult;
+import com.sun.j3d.utils.picking.PickTool;
 
 /**
  * A mouse behavior that allows user to pick and drag scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java
index c040c5a..c67bf8c 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickTranslateBehavior.java
@@ -44,13 +44,17 @@
 
 package com.sun.j3d.utils.picking.behaviors;
 
-import com.sun.j3d.utils.picking.*;
-import com.sun.j3d.utils.behaviors.mouse.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
+import com.sun.j3d.utils.picking.PickResult;
+import com.sun.j3d.utils.picking.PickTool;
 
 /**
  * A mouse behavior that allows user to pick and translate scene graph objects.
diff --git a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java
index 4fef813..5e87e65 100644
--- a/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/picking/behaviors/PickZoomBehavior.java
@@ -44,13 +44,17 @@
 
 package com.sun.j3d.utils.picking.behaviors;
 
-import com.sun.j3d.utils.picking.*;
-import com.sun.j3d.utils.behaviors.mouse.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
+import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
+import com.sun.j3d.utils.behaviors.mouse.MouseBehaviorCallback;
+import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
+import com.sun.j3d.utils.picking.PickResult;
+import com.sun.j3d.utils.picking.PickTool;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java
index db0e20d..606547a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileReader.java
@@ -44,16 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io;
 
-import java.io.File;
 import java.io.IOException;
 
-import javax.media.j3d.VirtualUniverse;
 import javax.media.j3d.BranchGroup;
-import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Canvas3D;
-import com.sun.j3d.utils.universe.ConfiguredUniverse;
+import javax.media.j3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.RandomAccessFileControl;
+import com.sun.j3d.utils.universe.ConfiguredUniverse;
 
 /**
  * Read Java3D BranchGraphs and/or Universe from a file. Individual branchgraphs or an
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java
index c8d9cb2..b326fab 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphFileWriter.java
@@ -46,13 +46,10 @@ package com.sun.j3d.utils.scenegraph.io;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Iterator;
 
 import javax.media.j3d.BranchGroup;
 import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.CapabilityNotSetException;
+
 import com.sun.j3d.utils.scenegraph.io.retained.RandomAccessFileControl;
 import com.sun.j3d.utils.universe.SimpleUniverse;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java
index f711096..bc9ffb0 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamReader.java
@@ -44,14 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io;
 
-import java.io.InputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 
 import javax.media.j3d.BranchGroup;
-import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Canvas3D;
+
 import com.sun.j3d.utils.scenegraph.io.retained.StreamControl;
 import com.sun.j3d.utils.universe.ConfiguredUniverse;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java
index 2c1389a..7a1c47a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/SceneGraphStreamWriter.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io;
 
-import java.io.File;
-import java.io.IOException;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.HashMap;
 
 import javax.media.j3d.BranchGroup;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.CapabilityNotSetException;
 import javax.media.j3d.DanglingReferenceException;
+
 import com.sun.j3d.utils.scenegraph.io.retained.StreamControl;
 import com.sun.j3d.utils.universe.SimpleUniverse;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionInputStream.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionInputStream.java
index f051d43..9710c1c 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionInputStream.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionInputStream.java
@@ -44,7 +44,6 @@
 
 package com.sun.j3d.utils.scenegraph.io.retained;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 
 class PositionInputStream extends java.io.InputStream {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionOutputStream.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionOutputStream.java
index 0afe5b7..eca9706 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionOutputStream.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/PositionOutputStream.java
@@ -44,7 +44,6 @@
 
 package com.sun.j3d.utils.scenegraph.io.retained;
 
-import java.io.DataOutputStream;
 import java.io.IOException;
 
 class PositionOutputStream extends java.io.OutputStream {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
index 64790bc..644e117 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/RandomAccessFileControl.java
@@ -44,21 +44,20 @@
 
 package com.sun.j3d.utils.scenegraph.io.retained;
 
-import java.io.RandomAccessFile;
-import java.io.IOException;
-import java.io.DataOutput;
 import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 
 import javax.media.j3d.BranchGroup;
-import javax.media.j3d.CapabilityNotSetException;
 import javax.media.j3d.Canvas3D;
+import javax.media.j3d.CapabilityNotSetException;
 
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NodeComponentState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
 import com.sun.j3d.utils.scenegraph.io.UnsupportedUniverseException;
-import com.sun.j3d.utils.universe.SimpleUniverse;
+import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
+import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 import com.sun.j3d.utils.universe.ConfiguredUniverse;
+import com.sun.j3d.utils.universe.SimpleUniverse;
 
 public class RandomAccessFileControl extends Controller {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
index 6bfc94d..fafebf4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/StreamControl.java
@@ -44,23 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.retained;
 
-import java.io.RandomAccessFile;
-import java.io.IOException;
-import java.io.DataOutput;
-import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 
-import javax.media.j3d.VirtualUniverse;
 import javax.media.j3d.BranchGroup;
-import javax.media.j3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NodeComponentState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
-import com.sun.j3d.utils.scenegraph.io.UnsupportedUniverseException;
 
 /**
  * Provides the infrastructure for ScenGraphStream Reader and Writer
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
index 0d6f8f3..4e6d444 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTable.java
@@ -44,26 +44,24 @@
 
 package com.sun.j3d.utils.scenegraph.io.retained;
 
-import java.io.IOException;
 import java.io.DataOutput;
-import java.io.DataInput;
-import java.util.HashMap;
+import java.io.IOException;
 import java.util.ArrayList;
-import java.util.ListIterator;
-import java.util.LinkedList;
-import java.util.Iterator;
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.ListIterator;
 import java.util.Stack;
 
 import javax.media.j3d.SceneGraphObject;
 
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NullSceneGraphObjectState;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NodeComponentState;
 import com.sun.j3d.utils.scenegraph.io.NamedObjectException;
 import com.sun.j3d.utils.scenegraph.io.ObjectNotLoadedException;
 import com.sun.j3d.utils.scenegraph.io.SceneGraphObjectReferenceControl;
+import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NodeComponentState;
+import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.NullSceneGraphObjectState;
+import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 
 /**
  * SymbolTable class for SceneGraph I/O.
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
index eb8b562..6416176 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/retained/SymbolTableData.java
@@ -44,10 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.retained;
 
-import java.io.DataOutput;
 import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
index 4ba56a5..2610a8f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/KBRotPosScaleSplinePathInterpolatorState.java
@@ -44,19 +44,18 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
+
+import com.sun.j3d.utils.behaviors.interpolators.KBKeyFrame;
+import com.sun.j3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.InterpolatorState;
-import com.sun.j3d.utils.behaviors.interpolators.KBRotPosScaleSplinePathInterpolator;
-import com.sun.j3d.utils.behaviors.interpolators.KBKeyFrame;
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.TransformInterpolatorState;
 
 public class KBRotPosScaleSplinePathInterpolatorState extends TransformInterpolatorState {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
index e3a6a62..894bdf6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/interpolators/RotPosScaleTCBSplinePathInterpolatorState.java
@@ -44,21 +44,19 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.interpolators;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
-import javax.vecmath.Quat4f;
+
+import com.sun.j3d.utils.behaviors.interpolators.RotPosScaleTCBSplinePathInterpolator;
+import com.sun.j3d.utils.behaviors.interpolators.TCBKeyFrame;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.InterpolatorState;
-import com.sun.j3d.utils.behaviors.interpolators.TCBSplinePathInterpolator;
-import com.sun.j3d.utils.behaviors.interpolators.RotPosScaleTCBSplinePathInterpolator;
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.TransformInterpolatorState;
-import com.sun.j3d.utils.behaviors.interpolators.TCBKeyFrame;
 
 public class RotPosScaleTCBSplinePathInterpolatorState extends TransformInterpolatorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
index f951d5b..9c8a8f3 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/behaviors/mouse/MouseBehaviorState.java
@@ -44,17 +44,16 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.behaviors.mouse;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.Interpolator;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
+import javax.media.j3d.TransformGroup;
+
 import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BehaviorState;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.TransformInterpolator;
 
 public class MouseBehaviorState extends BehaviorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
index 53604aa..60a343a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/BoxState.java
@@ -44,11 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import com.sun.j3d.utils.geometry.Box;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Appearance;
 import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Color3f;
+
+import com.sun.j3d.utils.geometry.Box;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
index 07c472a..93ee578 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ColorCubeState.java
@@ -44,14 +44,17 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import com.sun.j3d.utils.geometry.ColorCube;
-import javax.media.j3d.Shape3D;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Color3f;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.Shape3DState;
+import javax.media.j3d.Shape3D;
+
+import com.sun.j3d.utils.geometry.ColorCube;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.Shape3DState;
 
 public class ColorCubeState extends Shape3DState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
index 7e48078..9661bbd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/ConeState.java
@@ -44,14 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import com.sun.j3d.utils.geometry.Cone;
-import javax.media.j3d.SceneGraphObject;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Appearance;
-import javax.media.j3d.PolygonAttributes;
-import javax.media.j3d.AmbientLight;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Material;
+import javax.media.j3d.SceneGraphObject;
+
+import com.sun.j3d.utils.geometry.Cone;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
index e28d2d8..4b35793 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/CylinderState.java
@@ -44,10 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import com.sun.j3d.utils.geometry.Cylinder;
-import javax.media.j3d.SceneGraphObject;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Appearance;
+import javax.media.j3d.SceneGraphObject;
+
+import com.sun.j3d.utils.geometry.Cylinder;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
index d20db10..5ce39b7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/PrimitiveState.java
@@ -44,7 +44,10 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import com.sun.j3d.utils.geometry.Primitive;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
index 2c596a9..8a0732a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/SphereState.java
@@ -44,10 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import com.sun.j3d.utils.geometry.Sphere;
-import javax.media.j3d.SceneGraphObject;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Appearance;
+import javax.media.j3d.SceneGraphObject;
+
+import com.sun.j3d.utils.geometry.Sphere;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
index e5f5576..77855ff 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/geometry/Text2DState.java
@@ -44,15 +44,18 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.geometry;
 
-import java.io.*;
-import com.sun.j3d.utils.geometry.Sphere;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Shape3D;
 import javax.vecmath.Color3f;
+
 import com.sun.j3d.utils.geometry.Text2D;
-import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.LeafState;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.LeafState;
 
 public class Text2DState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
index 291774f..d2b6494 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/image/ImageComponent2DURLState.java
@@ -44,25 +44,16 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.image;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.awt.Point;
-import java.awt.image.*;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.ImageComponent2D;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.ImageComponentState;
 
-import javax.swing.*;
-import java.awt.*;
-
 public class ImageComponent2DURLState extends ImageComponentState {
 
     private static ImageComponent2DURLIOListener listener = new DefaultListener();
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
index f52d995..7ae3efa 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/PlatformGeometryState.java
@@ -44,13 +44,10 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import com.sun.j3d.utils.universe.PlatformGeometry;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
+import com.sun.j3d.utils.universe.PlatformGeometry;
 
 public class PlatformGeometryState extends BranchGroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
index 5d90c2d..bb1cc79 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/SimpleUniverseState.java
@@ -47,24 +47,26 @@ package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.util.Enumeration;
 import java.util.ArrayList;
-import javax.media.j3d.TransformGroup;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.HiResCoord;
-import javax.media.j3d.Locale;
+import java.util.Enumeration;
+
 import javax.media.j3d.BranchGroup;
 import javax.media.j3d.Canvas3D;
+import javax.media.j3d.HiResCoord;
+import javax.media.j3d.Locale;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
 import javax.vecmath.Matrix4d;
-import com.sun.j3d.utils.universe.MultiTransformGroup;
-import com.sun.j3d.utils.universe.ViewingPlatform;
-import com.sun.j3d.utils.universe.ViewerAvatar;
-import com.sun.j3d.utils.universe.PlatformGeometry;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.SceneGraphObjectState;
-import com.sun.j3d.utils.universe.SimpleUniverse;
 import com.sun.j3d.utils.universe.ConfiguredUniverse;
+import com.sun.j3d.utils.universe.MultiTransformGroup;
+import com.sun.j3d.utils.universe.PlatformGeometry;
+import com.sun.j3d.utils.universe.SimpleUniverse;
+import com.sun.j3d.utils.universe.ViewerAvatar;
+import com.sun.j3d.utils.universe.ViewingPlatform;
 
 public class SimpleUniverseState extends java.lang.Object {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
index 5472d5d..b08438f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/com/sun/j3d/utils/universe/ViewerAvatarState.java
@@ -44,14 +44,10 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.com.sun.j3d.utils.universe;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import com.sun.j3d.utils.universe.ViewerAvatar;
-
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 import com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d.BranchGroupState;
+import com.sun.j3d.utils.universe.ViewerAvatar;
 
 public class ViewerAvatarState extends BranchGroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
index 1f2a63f..e5346bb 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlphaState.java
@@ -47,10 +47,12 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.Alpha;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Alpha;
 
 public class AlphaState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
index af634b1..f18b8d4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AlternateAppearanceState.java
@@ -47,13 +47,15 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
+
 import javax.media.j3d.AlternateAppearance;
-import javax.media.j3d.BoundingLeaf;
 import javax.media.j3d.Appearance;
+import javax.media.j3d.BoundingLeaf;
 import javax.media.j3d.Group;
+import javax.media.j3d.SceneGraphObject;
+
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class AlternateAppearanceState extends LeafState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
index e7b2858..77355d1 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AmbientLightState.java
@@ -44,8 +44,8 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
 import javax.media.j3d.AmbientLight;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
index 21e4e6d..ef81a15 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AppearanceState.java
@@ -47,22 +47,23 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.NodeComponent;
+
 import javax.media.j3d.Appearance;
-import javax.media.j3d.PolygonAttributes;
-import javax.media.j3d.RenderingAttributes;
 import javax.media.j3d.ColoringAttributes;
 import javax.media.j3d.LineAttributes;
 import javax.media.j3d.Material;
 import javax.media.j3d.PointAttributes;
+import javax.media.j3d.PolygonAttributes;
+import javax.media.j3d.RenderingAttributes;
 import javax.media.j3d.TexCoordGeneration;
 import javax.media.j3d.Texture;
 import javax.media.j3d.TextureAttributes;
 import javax.media.j3d.TextureUnitState;
 import javax.media.j3d.TransparencyAttributes;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public class AppearanceState extends NodeComponentState {
 
     private int polygonAttributes=0;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
index bc433de..cf2aa1a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/AuralAttributesState.java
@@ -44,12 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.AuralAttributes;
 import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Vector3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
index 91e0e02..32530e0 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BackgroundSoundState.java
@@ -44,12 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.BackgroundSound;
 import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Point3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
index 5245a9d..8e406e6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BehaviorState.java
@@ -44,12 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Behavior;
-import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.BoundingLeaf;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
index c86a0b6..33fec89 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BillboardState.java
@@ -44,14 +44,16 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Billboard;
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.TransformGroup;
 import javax.vecmath.Point3f;
 import javax.vecmath.Vector3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
index a7047c6..041c9d5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BoundingLeafState.java
@@ -44,16 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.Bounds;
-import javax.media.j3d.BoundingBox;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.BoundingPolytope;
-import javax.media.j3d.NodeComponent;
 import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector4d;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
index 2ea92f3..1157c77 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/BranchGroupState.java
@@ -46,6 +46,7 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import javax.media.j3d.BranchGroup;
 import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
index 8689af7..460710b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ClipState.java
@@ -44,12 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.Clip;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.BoundingLeaf;
+import javax.media.j3d.Clip;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
index e4806eb..8d286ce 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColorInterpolatorState.java
@@ -44,13 +44,15 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.ColorInterpolator;
 import javax.media.j3d.Material;
 import javax.media.j3d.SceneGraphObject;
 import javax.vecmath.Color3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
index d4f181b..aa6cf7d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ColoringAttributesState.java
@@ -47,12 +47,14 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
+
 import javax.media.j3d.ColoringAttributes;
+import javax.media.j3d.SceneGraphObject;
 import javax.vecmath.Color3f;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public class ColoringAttributesState extends NodeComponentState {
 
     public ColoringAttributesState( SymbolTableData symbol, Controller control ) {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
index d8b8394..bc37cd6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/CompressedGeometryState.java
@@ -44,13 +44,15 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.vecmath.Point3d;
+import java.io.IOException;
+
 import javax.media.j3d.CompressedGeometry;
-import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.CompressedGeometryHeader;
+import javax.media.j3d.SceneGraphObject;
+import javax.vecmath.Point3d;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
index 45b81b3..31910a0 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ConeSoundState.java
@@ -44,12 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.ConeSound;
 import javax.media.j3d.SceneGraphObject;
 import javax.vecmath.Vector3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
index 5c3e26b..5b7e721 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DecalGroupState.java
@@ -46,6 +46,7 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import javax.media.j3d.DecalGroup;
 import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
index be62c3d..bf23991 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentFloatState.java
@@ -47,10 +47,12 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.DepthComponentFloat;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.DepthComponentFloat;
 
 public class DepthComponentFloatState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
index 493b97b..96c7bc6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentIntState.java
@@ -47,10 +47,12 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.DepthComponentInt;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.DepthComponentInt;
 
 public class DepthComponentIntState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
index 2d4f3ab..355f233 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DepthComponentNativeState.java
@@ -47,10 +47,12 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.DepthComponentNative;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.DepthComponentNative;
 
 /**
  * We have no access to the data inside a DepthComponentNative and
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
index 5c877fb..1fcbb1b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DirectionalLightState.java
@@ -44,9 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.DirectionalLight;
 import javax.vecmath.Vector3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
index f8c511e..e307d64 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/DistanceLODState.java
@@ -47,12 +47,14 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
+
 import javax.media.j3d.DistanceLOD;
+import javax.media.j3d.SceneGraphObject;
 import javax.vecmath.Point3f;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public class DistanceLODState extends LODState {
 
     private int numDistances;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
index 7e08cf9..1161e21 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ExponentialFogState.java
@@ -44,11 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.ExponentialFog;
-import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
index 58b322a..a40e314 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/FogState.java
@@ -44,12 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
-import javax.media.j3d.Fog;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.BoundingLeaf;
+import javax.media.j3d.Fog;
 import javax.media.j3d.Group;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.SceneGraphObject;
 import javax.vecmath.Color3f;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
index e144fe0..278fc85 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Font3DState.java
@@ -43,20 +43,20 @@
  */
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
+import java.awt.Font;
+import java.awt.Shape;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.PathIterator;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Font3D;
 import javax.media.j3d.FontExtrusion;
 import javax.media.j3d.SceneGraphObject;
-import java.awt.Font;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import java.awt.Shape;
-import java.lang.String;
-import java.lang.Integer;
-import java.io.IOException;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.awt.geom.PathIterator;
-import java.awt.geom.GeneralPath;
 
 public class Font3DState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
index f28bd88..257ad29 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryArrayState.java
@@ -44,20 +44,35 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
 import javax.media.j3d.GeometryArray;
-import javax.media.j3d.IndexedGeometryArray;
 import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.*;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import javax.media.j3d.IndexedGeometryArray;
 import javax.media.j3d.J3DBuffer;
-import com.sun.j3d.internal.ByteBufferWrapper;
+import javax.vecmath.Color3b;
+import javax.vecmath.Color3f;
+import javax.vecmath.Color4b;
+import javax.vecmath.Color4f;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
+import javax.vecmath.TexCoord2f;
+import javax.vecmath.TexCoord3f;
+import javax.vecmath.Vector3f;
+
 import com.sun.j3d.internal.BufferWrapper;
-import com.sun.j3d.internal.FloatBufferWrapper;
-import com.sun.j3d.internal.DoubleBufferWrapper;
+import com.sun.j3d.internal.ByteBufferWrapper;
 import com.sun.j3d.internal.ByteOrderWrapper;
+import com.sun.j3d.internal.DoubleBufferWrapper;
+import com.sun.j3d.internal.FloatBufferWrapper;
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class GeometryArrayState extends GeometryState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
index 02038f5..1e24eb7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryState.java
@@ -46,8 +46,6 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.Geometry;
 
 public abstract class GeometryState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
index 33a7b36..b9fbf84 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GeometryStripArrayState.java
@@ -44,10 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.GeometryStripArray;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.*;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
index 6bae7a9..228a4cc 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/GroupState.java
@@ -44,11 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
-import java.util.Enumeration;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Group;
 import javax.media.j3d.Node;
-import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
index f371d4e..34c4898 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent2DState.java
@@ -44,24 +44,17 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
+import java.awt.image.BufferedImage;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.awt.Point;
-import java.awt.image.*;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.ImageComponent2D;
+import javax.media.j3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
-import javax.swing.*;
-import java.awt.*;
-
 public class ImageComponent2DState extends ImageComponentState {
 
     private BufferedImage bufferedImage;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
index 7bc4e8f..61feb9f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponent3DState.java
@@ -44,24 +44,17 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
+import java.awt.image.BufferedImage;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.awt.Point;
-import java.awt.image.*;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.ImageComponent3D;
+import javax.media.j3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
-import javax.swing.*;
-import java.awt.*;
-
 public class ImageComponent3DState extends ImageComponentState {
 
     private BufferedImage[] bufferedImages;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
index 2cd0309..9fd8d7f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
@@ -44,27 +44,35 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.DataOutput;
-import java.io.DataInput;
+import java.awt.Point;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferInt;
+import java.awt.image.DirectColorModel;
+import java.awt.image.Raster;
+import java.awt.image.SampleModel;
+import java.awt.image.SinglePixelPackedSampleModel;
+import java.awt.image.WritableRaster;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
 import java.io.DataInputStream;
+import java.io.DataOutput;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
-import java.io.IOException;
-import java.awt.Point;
-import java.awt.image.*;
+
 import javax.media.j3d.ImageComponent;
+
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.sun.image.codec.jpeg.JPEGImageDecoder;
+import com.sun.image.codec.jpeg.JPEGImageEncoder;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException;
-import java.awt.color.ColorSpace;
-import java.awt.image.DataBuffer;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-import com.sun.image.codec.jpeg.JPEGImageDecoder;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGEncodeParam;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class ImageComponentState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
index 9859003..67f37f8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryArrayState.java
@@ -44,12 +44,18 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import javax.media.j3d.GeometryArray;
 import javax.media.j3d.IndexedGeometryArray;
 import javax.media.j3d.IndexedGeometryStripArray;
-import javax.media.j3d.GeometryArray;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.*;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
index b4d54ac..ca64df8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedGeometryStripArrayState.java
@@ -44,10 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.IndexedGeometryStripArray;
-import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.*;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
index d614863..e84c899 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.IndexedLineArray;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
index a8e52dc..54fc2e5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedLineStripArrayState.java
@@ -44,15 +44,9 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.IndexedLineStripArray;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
index c5e3e79..9b0fd68 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedPointArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.IndexedPointArray;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
index a5b15fa..0adb6e0 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedQuadArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.IndexedQuadArray;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
index 88d8d64..564c1b6 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.IndexedTriangleArray;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
index 543b86b..bba6ee8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleFanArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.IndexedTriangleFanArray;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
index 9d984bd..3687631 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/IndexedTriangleStripArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.IndexedTriangleStripArray;
+import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
index 305ae16..fdf2b08 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/InterpolatorState.java
@@ -44,12 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.Interpolator;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.Alpha;
+import javax.media.j3d.Interpolator;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
index 7062d97..70f06a8 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LODState.java
@@ -47,11 +47,12 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.LOD;
+import javax.media.j3d.Switch;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Switch;
-import javax.media.j3d.LOD;
 
 public abstract class LODState extends BehaviorState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
index 2b6c470..34e6b4f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LeafState.java
@@ -44,7 +44,6 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import javax.media.j3d.Leaf;
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
index 46a8f8b..d419161 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LightState.java
@@ -44,11 +44,15 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
-import javax.media.j3d.Light;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.BoundingLeaf;
 import javax.media.j3d.Group;
+import javax.media.j3d.Light;
 import javax.vecmath.Color3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
index 5adb1f1..15bb449 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineArrayState.java
@@ -46,6 +46,7 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import javax.media.j3d.LineArray;
 import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
index 348d1a5..6adda58 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineAttributesState.java
@@ -47,10 +47,11 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.LineAttributes;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.LineAttributes;
 
 public class LineAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
index 8d7dc6e..7ce9450 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LineStripArrayState.java
@@ -46,6 +46,7 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import javax.media.j3d.LineStripArray;
 import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
index 60324a0..126acf7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinearFogState.java
@@ -44,11 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.LinearFog;
-import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
index c005d09..6224d76 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/LinkState.java
@@ -47,8 +47,10 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
 import javax.media.j3d.Link;
 import javax.media.j3d.SharedGroup;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
index 34c2222..ca79907 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MaterialState.java
@@ -47,12 +47,13 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
+
 import javax.media.j3d.Material;
 import javax.vecmath.Color3f;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public class MaterialState extends NodeComponentState {
 
     public MaterialState( SymbolTableData symbol, Controller control ) {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
index 85ce1dd..a98c6e1 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ModelClipState.java
@@ -47,14 +47,15 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.ModelClip;
+
 import javax.media.j3d.BoundingLeaf;
 import javax.media.j3d.Group;
+import javax.media.j3d.ModelClip;
 import javax.vecmath.Vector4d;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public class ModelClipState extends LeafState {
 
     private int[] scopes;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
index d75ec56..58251a4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/MorphState.java
@@ -44,13 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.Morph;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.GeometryArray;
+import java.io.IOException;
+
 import javax.media.j3d.Appearance;
+import javax.media.j3d.GeometryArray;
+import javax.media.j3d.Morph;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
index 020e489..d3f3d08 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeComponentState.java
@@ -44,14 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.DataOutput;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.NodeComponent;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.SceneGraphObject;
 
 public abstract class NodeComponentState extends SceneGraphObjectState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
index 7e46f41..986659a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NodeState.java
@@ -44,10 +44,11 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.Node;
-import javax.media.j3d.NodeComponent;
-import javax.media.j3d.SceneGraphObject;
 
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
index 90b702e..6632210 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/NullSceneGraphObjectState.java
@@ -44,18 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Enumeration;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Color3f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector4d;
-import javax.vecmath.Tuple3d;
-import javax.vecmath.Tuple4d;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
index 7413c2d..ac69be2 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrderedGroupState.java
@@ -44,12 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.OrderedGroup;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import java.io.IOException;
-import java.io.DataInput;
-import java.io.DataOutput;
 
 public class OrderedGroupState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
index de0590b..dc0fa5a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/OrientedShape3DState.java
@@ -44,13 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.OrientedShape3D;
-import javax.media.j3d.SceneGraphObject;
 import javax.vecmath.Point3f;
 import javax.vecmath.Vector3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
index 9c680ce..a0db1af 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PathInterpolatorState.java
@@ -44,11 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.PathInterpolator;
-import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
index 9c1e1f9..6b62f19 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointAttributesState.java
@@ -47,10 +47,11 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.PointAttributes;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.PointAttributes;
 
 public class PointAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
index dd8601c..43022db 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointLightState.java
@@ -44,9 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.PointLight;
 import javax.vecmath.Point3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
index 0476db3..2e2f03e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PointSoundState.java
@@ -44,12 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.PointSound;
-import javax.media.j3d.SceneGraphObject;
 import javax.vecmath.Point3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
index c7b7109..f7e9f13 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PolygonAttributesState.java
@@ -47,10 +47,11 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.PolygonAttributes;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.PolygonAttributes;
 
 public class PolygonAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
index d229e49..2f56b7b 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionInterpolatorState.java
@@ -44,14 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.PositionInterpolator;
 import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
index 978146a..a4f6a90 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/PositionPathInterpolatorState.java
@@ -44,14 +44,16 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.PositionPathInterpolator;
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
 import javax.vecmath.Point3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
index 15cbd7d..86b81bb 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/QuadArrayState.java
@@ -47,8 +47,10 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
 import javax.media.j3d.QuadArray;
 import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
index 733eeec..b3b88fb 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RasterState.java
@@ -44,18 +44,19 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
+import java.awt.Dimension;
+import java.awt.Point;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
+import javax.media.j3d.DepthComponent;
+import javax.media.j3d.ImageComponent2D;
 import javax.media.j3d.Raster;
-import javax.media.j3d.SceneGraphObject;
+import javax.vecmath.Point3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import java.awt.Point;
-import javax.vecmath.Point3f;
-import java.awt.Dimension;
-import javax.media.j3d.ImageComponent2D;
-import javax.media.j3d.DepthComponent;
 
 public class RasterState extends GeometryState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
index 71e5113..5670c49 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RenderingAttributesState.java
@@ -47,10 +47,11 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.RenderingAttributes;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.RenderingAttributes;
 
 public class RenderingAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
index f4b8864..36975de 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosPathInterpolatorState.java
@@ -44,15 +44,17 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.RotPosPathInterpolator;
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
 import javax.vecmath.Point3f;
 import javax.vecmath.Quat4f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
index dfd4c5b..875eb6f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotPosScalePathInterpolatorState.java
@@ -44,15 +44,17 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.RotPosScalePathInterpolator;
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
 import javax.vecmath.Point3f;
 import javax.vecmath.Quat4f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
index 84db745..0220fcf 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationInterpolatorState.java
@@ -44,15 +44,15 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
+import javax.media.j3d.Alpha;
 import javax.media.j3d.RotationInterpolator;
 import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
-import javax.media.j3d.Alpha;
-import javax.vecmath.Matrix4d;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
index d33e998..82f7c31 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/RotationPathInterpolatorState.java
@@ -44,14 +44,16 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.RotationPathInterpolator;
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
 import javax.vecmath.Quat4f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
index e2901a1..ddce701 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ScaleInterpolatorState.java
@@ -44,14 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.ScaleInterpolator;
 import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
index b6b784f..214ab5e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SceneGraphObjectState.java
@@ -44,19 +44,21 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.Serializable;
 import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.Enumeration;
+
 import javax.media.j3d.SceneGraphObject;
-import javax.vecmath.Color3f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector4d;
-import javax.vecmath.Tuple3d;
-import javax.vecmath.Tuple4d;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public abstract class SceneGraphObjectState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
index 657f1d7..b526122 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Shape3DState.java
@@ -44,13 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.Shape3D;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Geometry;
+import java.io.IOException;
+
 import javax.media.j3d.Appearance;
+import javax.media.j3d.Geometry;
+import javax.media.j3d.Shape3D;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
index 9b9356b..c17d315 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SharedGroupState.java
@@ -45,6 +45,7 @@
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
 import javax.media.j3d.SharedGroup;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
index 64cdb4c..e69ee6e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundState.java
@@ -44,14 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.Sound;
-import javax.media.j3d.MediaContainer;
-import javax.media.j3d.SceneGraphObject;
+import java.io.IOException;
+
 import javax.media.j3d.BoundingLeaf;
-import javax.media.j3d.SceneGraphObject;
+import javax.media.j3d.MediaContainer;
+import javax.media.j3d.Sound;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
index dfd4665..2af212f 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SoundscapeState.java
@@ -44,13 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.Soundscape;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.BoundingLeaf;
+import java.io.IOException;
+
 import javax.media.j3d.AuralAttributes;
+import javax.media.j3d.BoundingLeaf;
+import javax.media.j3d.Soundscape;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
index fb3ba4a..9372758 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SpotLightState.java
@@ -44,12 +44,15 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 
 import javax.media.j3d.PointLight;
 import javax.media.j3d.SpotLight;
 import javax.vecmath.Point3f;
 import javax.vecmath.Vector3f;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
index 64a428a..0a1b507 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchState.java
@@ -47,10 +47,11 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.Switch;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Switch;
 
 public class SwitchState extends GroupState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
index 4281c1e..cb0c2e4 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/SwitchValueInterpolatorState.java
@@ -44,15 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.SwitchValueInterpolator;
-import javax.media.j3d.Switch;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
+import javax.media.j3d.Switch;
+import javax.media.j3d.SwitchValueInterpolator;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
index 7f9b3a2..66620f5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TexCoordGenerationState.java
@@ -47,12 +47,13 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
+
 import javax.media.j3d.TexCoordGeneration;
 import javax.vecmath.Vector4f;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public class TexCoordGenerationState extends NodeComponentState {
 
     public TexCoordGenerationState( SymbolTableData symbol, Controller control ) {
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
index 95bdc53..9930848 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture2DState.java
@@ -47,11 +47,13 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
+import javax.media.j3d.ImageComponent2D;
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Texture2D;
-import javax.media.j3d.ImageComponent2D;
+
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class Texture2DState extends TextureState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
index 535eb78..2e4aece 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/Texture3DState.java
@@ -47,11 +47,13 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 import javax.media.j3d.SceneGraphObject;
 import javax.media.j3d.Texture3D;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public class Texture3DState extends TextureState {
 
     private int depth;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
index 58ac801..ef47255 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureAttributesState.java
@@ -47,14 +47,15 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
+
 import javax.media.j3d.TextureAttributes;
 import javax.media.j3d.Transform3D;
 import javax.vecmath.Color4f;
 import javax.vecmath.Matrix4d;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public class TextureAttributesState extends NodeComponentState {
 
     private static final int MAX_COLOR_OPERANDS = 2;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
index d35edeb..a6bf5d7 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureCubeMapState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TextureCubeMap;
 import javax.media.j3d.ImageComponent;
 import javax.media.j3d.ImageComponent2D;
+import javax.media.j3d.SceneGraphObject;
+import javax.media.j3d.TextureCubeMap;
+
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TextureCubeMapState extends TextureState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
index 4ea168d..bc78e21 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureState.java
@@ -47,15 +47,16 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
+
 import javax.media.j3d.ImageComponent;
 import javax.media.j3d.Texture;
 import javax.media.j3d.TextureCubeMap;
 import javax.vecmath.Color4f;
 import javax.vecmath.Point3f;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public abstract class TextureState extends NodeComponentState {
 
     private int[] imageComponents;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
index 5d8a2e7..41b4f71 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TextureUnitStateState.java
@@ -47,14 +47,14 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TextureUnitState;
+
+import javax.media.j3d.TexCoordGeneration;
 import javax.media.j3d.Texture;
 import javax.media.j3d.TextureAttributes;
-import javax.media.j3d.TexCoordGeneration;
-import javax.vecmath.Color3f;
+import javax.media.j3d.TextureUnitState;
+
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
 public class TextureUnitStateState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
index 0919aa7..5fd1618 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformGroupState.java
@@ -44,11 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.TransformGroup;
+import java.io.IOException;
+
 import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
index ca5fad7..954bc0e 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransformInterpolatorState.java
@@ -44,17 +44,16 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.Interpolator;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Alpha;
-import com.sun.j3d.utils.scenegraph.io.retained.Controller;
-import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+import java.io.IOException;
+
 import javax.media.j3d.TransformGroup;
 import javax.media.j3d.TransformInterpolator;
 
+import com.sun.j3d.utils.scenegraph.io.retained.Controller;
+import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
+
 public abstract class TransformInterpolatorState extends InterpolatorState {
 
     private int target=0;
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
index f1d06ff..2fb6542 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyAttributesState.java
@@ -47,11 +47,11 @@ package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+
+import javax.media.j3d.TransparencyAttributes;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
-import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.TransparencyAttributes;
-import javax.vecmath.Color3f;
 
 public class TransparencyAttributesState extends NodeComponentState {
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
index 438fddc..0774c04 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TransparencyInterpolatorState.java
@@ -44,15 +44,14 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
-import javax.media.j3d.TransparencyInterpolator;
-import javax.media.j3d.TransparencyAttributes;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
-import javax.vecmath.Point3f;
+import javax.media.j3d.TransparencyAttributes;
+import javax.media.j3d.TransparencyInterpolator;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
index 1826da1..579b6d9 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.TriangleArray;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
+import javax.media.j3d.TriangleArray;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
index 2856732..14b30cd 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleFanArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.TriangleFanArray;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
+import javax.media.j3d.TriangleFanArray;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
index 7720ad3..d6957d5 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/TriangleStripArrayState.java
@@ -44,15 +44,13 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import javax.media.j3d.TriangleStripArray;
+import java.io.IOException;
+
 import javax.media.j3d.SceneGraphObject;
+import javax.media.j3d.TriangleStripArray;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
index dba15d6..7d64e35 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ViewPlatformState.java
@@ -44,11 +44,12 @@
 
 package com.sun.j3d.utils.scenegraph.io.state.javax.media.j3d;
 
-import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.IOException;
+
 import javax.media.j3d.ViewPlatform;
-import javax.media.j3d.SceneGraphObject;
+
 import com.sun.j3d.utils.scenegraph.io.retained.Controller;
 import com.sun.j3d.utils.scenegraph.io.retained.SymbolTableData;
 
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java b/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
index a7f2f6a..771fb7a 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/SimpleDistanceComparator.java
@@ -45,7 +45,6 @@
 package com.sun.j3d.utils.scenegraph.transparency;
 
 import java.util.Comparator;
-import javax.media.j3d.Transform3D;
 
 /**
  * Sample TransparencySortComparator which has the same functionality as
diff --git a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java b/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
index 27ed58d..801259d 100644
--- a/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
+++ b/src/classes/share/com/sun/j3d/utils/scenegraph/transparency/TransparencySortController.java
@@ -46,6 +46,7 @@ package com.sun.j3d.utils.scenegraph.transparency;
 
 import java.util.Comparator;
 import java.util.WeakHashMap;
+
 import javax.media.j3d.View;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/shader/StringIO.java b/src/classes/share/com/sun/j3d/utils/shader/StringIO.java
index 16af4bf..4b354d5 100644
--- a/src/classes/share/com/sun/j3d/utils/shader/StringIO.java
+++ b/src/classes/share/com/sun/j3d/utils/shader/StringIO.java
@@ -44,9 +44,9 @@
 
 package com.sun.j3d.utils.shader;
 
-import java.io.IOException;
 import java.io.File;
 import java.io.FileReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
index f286f38..c163fb1 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigCommand.java
@@ -44,11 +44,12 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.text.DecimalFormat ;
-import java.text.FieldPosition ;
-import java.util.Collection ;
-import javax.vecmath.Matrix3d ;
-import javax.vecmath.Matrix4d ;
+import java.text.DecimalFormat;
+import java.text.FieldPosition;
+import java.util.Collection;
+
+import javax.vecmath.Matrix3d;
+import javax.vecmath.Matrix4d;
 
 /**
  * Contains the elements which compose a configuration file command,
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java
index e5bee2f..7d05a09 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigContainer.java
@@ -44,12 +44,22 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.io.* ;
-import java.util.* ;
-import java.net.URL ;
-import java.net.MalformedURLException ;
-import javax.media.j3d.* ;
-import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior ;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StreamTokenizer;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Loads a Java 3D configuration file and creates a container of named objects
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
index ac9c7fa..b475ea2 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigDevice.java
@@ -43,7 +43,7 @@
  */
 
 package com.sun.j3d.utils.universe ;
-import javax.media.j3d.InputDevice ;
+import javax.media.j3d.InputDevice;
 
 /**
  * Mostly empty now; ConfigObject provides all required methods.
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java
index f4fe88a..7e0566e 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigObject.java
@@ -44,9 +44,10 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.lang.reflect.* ;
-import java.util.List ;
-import java.util.ArrayList ;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Base class for all configuration objects.  A ConfigObject processes
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
index 0d2cda3..26063fe 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalBody.java
@@ -44,12 +44,10 @@
 
 package com.sun.j3d.utils.universe;
 
-import java.awt.event.*;
-import java.lang.Integer;
-import java.io.*;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import java.util.*;
+import javax.media.j3d.PhysicalBody;
+import javax.media.j3d.Transform3D;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point3d;
 
 class ConfigPhysicalBody extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
index d8dc024..ecfb79c 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigPhysicalEnvironment.java
@@ -44,9 +44,13 @@
 
 package com.sun.j3d.utils.universe ;
 
-import javax.media.j3d.* ;
-import javax.vecmath.* ;
-import java.util.* ;
+import java.util.ArrayList;
+
+import javax.media.j3d.InputDevice;
+import javax.media.j3d.PhysicalEnvironment;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.View;
+import javax.vecmath.Matrix4d;
 
 class ConfigPhysicalEnvironment extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
index f2d69b0..8b2b308 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigScreen.java
@@ -44,13 +44,14 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.awt.Window ;
-import javax.media.j3d.Canvas3D ;
-import javax.media.j3d.View ;
-import javax.swing.JFrame ;
-import javax.swing.JPanel ;
-import javax.vecmath.Matrix4d ;
-import javax.vecmath.Point2d ;
+import java.awt.Window;
+
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.View;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point2d;
 
 class ConfigScreen extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
index 86cc831..59ad85b 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigSensor.java
@@ -44,8 +44,8 @@
 
 package com.sun.j3d.utils.universe ;
 
-import javax.vecmath.Point3d ;
-import javax.media.j3d.Sensor ;
+import javax.media.j3d.Sensor;
+import javax.vecmath.Point3d;
 
 class ConfigSensor extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
index 150741a..2ddbe67 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigSexpression.java
@@ -44,13 +44,18 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.awt.event.* ;
-import java.io.* ;
-import java.lang.Integer ;
-import java.lang.Boolean ;
-import java.util.* ;
-import javax.vecmath.* ;
-import javax.media.j3d.* ;
+import java.io.IOException;
+import java.io.StreamTokenizer;
+import java.util.ArrayList;
+
+import javax.media.j3d.BoundingSphere;
+import javax.media.j3d.Transform3D;
+import javax.vecmath.Matrix3d;
+import javax.vecmath.Matrix4d;
+import javax.vecmath.Point2d;
+import javax.vecmath.Point3d;
+import javax.vecmath.Point4d;
+import javax.vecmath.Vector3d;
 
 class ConfigSexpression {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
index 4d45a7b..bf97199 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigView.java
@@ -44,9 +44,14 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.util.* ;
-import javax.media.j3d.* ;
-import javax.vecmath.* ;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.media.j3d.PhysicalBody;
+import javax.media.j3d.PhysicalEnvironment;
+import javax.media.j3d.View;
+import javax.vecmath.Point3d;
 
 class ConfigView extends ConfigObject {
     /**
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
index faec569..f926d40 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatform.java
@@ -44,14 +44,14 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.util.ArrayList ;
-import javax.media.j3d.Node ;
-import javax.media.j3d.View ;
-import javax.media.j3d.ViewPlatform ;
-import javax.media.j3d.Transform3D ;
-import javax.media.j3d.TransformGroup ;
-import javax.vecmath.Matrix4d ;
-import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior ;
+import java.util.ArrayList;
+
+import javax.media.j3d.Node;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.View;
+import javax.media.j3d.ViewPlatform;
+import javax.vecmath.Matrix4d;
 
 class ConfigViewPlatform extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java b/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
index 226b507..ba2fc9a 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfigViewPlatformBehavior.java
@@ -44,14 +44,11 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.lang.reflect.* ;
-import java.util.ArrayList ;
-import javax.vecmath.Matrix4d ;
-import javax.media.j3d.Bounds ;
-import javax.media.j3d.Canvas3D ;
-import javax.media.j3d.Sensor ;
-import javax.media.j3d.Transform3D ;
-import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior ;
+import javax.media.j3d.Bounds;
+import javax.media.j3d.Transform3D;
+import javax.vecmath.Matrix4d;
+
+import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
 
 class ConfigViewPlatformBehavior extends ConfigObject {
 
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java b/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
index f1ceedb..afbd081 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ConfiguredUniverse.java
@@ -45,11 +45,14 @@
 package com.sun.j3d.utils.universe;
 
 import java.net.URL;
-import java.net.MalformedURLException;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
-import javax.media.j3d.*;
+
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.HiResCoord;
+import javax.media.j3d.Locale;
+import javax.media.j3d.View;
 
 /**
  * This utility class creates all the necessary objects on the view side of
diff --git a/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java b/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java
index 83fb88f..9996179 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/LocaleFactory.java
@@ -44,8 +44,8 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.Locale;
 import javax.media.j3d.HiResCoord;
+import javax.media.j3d.Locale;
 import javax.media.j3d.VirtualUniverse;
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java b/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java
index 373aae1..4971776 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/MultiTransformGroup.java
@@ -44,8 +44,7 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.TransformGroup;
 
 /**
  * A convenience class that effectively creates a series of TransformGroup
diff --git a/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java b/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java
index ce3ab49..ef2f9c3 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/PlatformGeometry.java
@@ -44,8 +44,7 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.BranchGroup;
 
 /**
  * This class holds any geometry that should be associated with the
diff --git a/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java b/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java
index 567ddfd..2865094 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/SimpleUniverse.java
@@ -44,12 +44,19 @@
 
 package com.sun.j3d.utils.universe;
 
-import com.sun.j3d.utils.geometry.Primitive;
-import java.awt.GraphicsEnvironment;
 import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
 import java.net.URL;
 
-import javax.media.j3d.*;
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.GraphicsConfigTemplate3D;
+import javax.media.j3d.HiResCoord;
+import javax.media.j3d.Locale;
+import javax.media.j3d.View;
+import javax.media.j3d.VirtualUniverse;
+
+import com.sun.j3d.utils.geometry.Primitive;
 
 
 /**
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java b/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
index dcaf61e..ec7d097 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ViewInfo.java
@@ -44,15 +44,31 @@
 
 package com.sun.j3d.utils.universe ;
 
-import java.awt.GraphicsConfiguration ;
+import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
-import java.awt.Point ;
-import java.awt.Rectangle ;
-import java.text.DecimalFormat ;
-import java.text.FieldPosition ;
-import java.util.* ;
-import javax.media.j3d.* ;
-import javax.vecmath.* ;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.text.DecimalFormat;
+import java.text.FieldPosition;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.Node;
+import javax.media.j3d.PhysicalBody;
+import javax.media.j3d.PhysicalEnvironment;
+import javax.media.j3d.Screen3D;
+import javax.media.j3d.Sensor;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.View;
+import javax.media.j3d.ViewPlatform;
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
 
 /**
  * Provides methods to extract synchronized transform information from a View.
diff --git a/src/classes/share/com/sun/j3d/utils/universe/Viewer.java b/src/classes/share/com/sun/j3d/utils/universe/Viewer.java
index 6e1d94e..4fd113a 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/Viewer.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/Viewer.java
@@ -44,14 +44,34 @@
 
 package com.sun.j3d.utils.universe;
 
-import java.awt.event.*;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Frame;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Panel;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.lang.reflect.Constructor;
 import java.net.URL;
-import java.util.*;
-import javax.media.j3d.*;
-import javax.swing.*;
+import java.util.HashMap;
+
+import javax.media.j3d.AudioDevice;
+import javax.media.j3d.Canvas3D;
+import javax.media.j3d.GraphicsConfigTemplate3D;
+import javax.media.j3d.PhysicalBody;
+import javax.media.j3d.PhysicalEnvironment;
+import javax.media.j3d.Screen3D;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.View;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JWindow;
+
 import com.sun.j3d.audioengines.AudioEngine3DL2;
-import java.lang.reflect.Constructor;
 
 /**
  * The Viewer class holds all the information that describes the physical
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java b/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
index 2759eef..3dcb59b 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ViewerAvatar.java
@@ -44,8 +44,7 @@
 
 package com.sun.j3d.utils.universe;
 
-import javax.media.j3d.*;
-import javax.vecmath.*;
+import javax.media.j3d.BranchGroup;
 
 /**
  * This class holds geomtry that should be associated with the View's
diff --git a/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java b/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java
index 490af23..0dfad43 100644
--- a/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java
+++ b/src/classes/share/com/sun/j3d/utils/universe/ViewingPlatform.java
@@ -46,12 +46,17 @@ package com.sun.j3d.utils.universe;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Vector;
-import java.awt.Component;
-import javax.media.j3d.*;
-import javax.vecmath.*;
-import com.sun.j3d.utils.behaviors.vp.*;
+
+import javax.media.j3d.BranchGroup;
+import javax.media.j3d.Group;
+import javax.media.j3d.Transform3D;
+import javax.media.j3d.TransformGroup;
+import javax.media.j3d.View;
+import javax.media.j3d.ViewPlatform;
+import javax.vecmath.Vector3d;
+
 import com.sun.j3d.internal.J3dUtilsI18N;
+import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
 
 /**
  * This class is used to set up the "view" side of a Java 3D scene graph.