Minor Reorganization
-AndyB