diff --git a/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/ITuplePairComparator.java b/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/ITuplePairComparator.java
index 5e7ed12..3251944 100644
--- a/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/ITuplePairComparator.java
+++ b/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/ITuplePairComparator.java
@@ -1,3 +1,17 @@
+/*
+ * Copyright 2009-2010 by The Regents of the University of California
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * you may obtain a copy of the License from
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package edu.uci.ics.hyracks.api.dataflow.value;
 
 import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor;
diff --git a/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/ITuplePairComparatorFactory.java b/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/ITuplePairComparatorFactory.java
index be06fa3..26cb525 100644
--- a/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/ITuplePairComparatorFactory.java
+++ b/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/dataflow/value/ITuplePairComparatorFactory.java
@@ -1,9 +1,22 @@
+/*
+ * Copyright 2009-2010 by The Regents of the University of California
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * you may obtain a copy of the License from
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package edu.uci.ics.hyracks.api.dataflow.value;
 
 import java.io.Serializable;
 
+public interface ITuplePairComparatorFactory extends Serializable {
 
-public interface ITuplePairComparatorFactory extends Serializable{
-    
     public ITuplePairComparator createTuplePairComparator();
 }
diff --git a/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java b/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java
index 928e9df..5ee8fd5 100644
--- a/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java
+++ b/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoin.java
@@ -1,3 +1,17 @@
+/*
+ * Copyright 2009-2010 by The Regents of the University of California
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * you may obtain a copy of the License from
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package edu.uci.ics.hyracks.dataflow.std.join;
 
 import java.nio.ByteBuffer;
@@ -16,144 +30,137 @@
 import edu.uci.ics.hyracks.dataflow.common.io.RunFileWriter;
 
 public class NestedLoopJoin {
-	private final FrameTupleAccessor accessorInner;
-	private final FrameTupleAccessor accessorOuter;
-	private final FrameTupleAppender appender;
-	private final ITuplePairComparator tpComparator;
-	private final ByteBuffer outBuffer;
-	private final ByteBuffer innerBuffer;
-	private final List<ByteBuffer> outBuffers;
-	private final int memSize;
-	private final IHyracksStageletContext ctx;
-	private RunFileReader runFileReader;
-	private int currentMemSize = 0;
-	private final RunFileWriter runFileWriter;
+    private final FrameTupleAccessor accessorInner;
+    private final FrameTupleAccessor accessorOuter;
+    private final FrameTupleAppender appender;
+    private final ITuplePairComparator tpComparator;
+    private final ByteBuffer outBuffer;
+    private final ByteBuffer innerBuffer;
+    private final List<ByteBuffer> outBuffers;
+    private final int memSize;
+    private final IHyracksStageletContext ctx;
+    private RunFileReader runFileReader;
+    private int currentMemSize = 0;
+    private final RunFileWriter runFileWriter;
 
-	public NestedLoopJoin(IHyracksStageletContext ctx,
-			FrameTupleAccessor accessor0, FrameTupleAccessor accessor1,
-			ITuplePairComparator comparators, int memSize)
-			throws HyracksDataException {
-		this.accessorInner = accessor1;
-		this.accessorOuter = accessor0;
-		this.appender = new FrameTupleAppender(ctx.getFrameSize());
-		this.tpComparator = comparators;
-		this.outBuffer = ctx.allocateFrame();
-		this.innerBuffer = ctx.allocateFrame();
-		this.appender.reset(outBuffer, true);
-		this.outBuffers = new ArrayList<ByteBuffer>();
-		this.memSize = memSize;
-		this.ctx = ctx;
+    public NestedLoopJoin(IHyracksStageletContext ctx, FrameTupleAccessor accessor0, FrameTupleAccessor accessor1,
+            ITuplePairComparator comparators, int memSize) throws HyracksDataException {
+        this.accessorInner = accessor1;
+        this.accessorOuter = accessor0;
+        this.appender = new FrameTupleAppender(ctx.getFrameSize());
+        this.tpComparator = comparators;
+        this.outBuffer = ctx.allocateFrame();
+        this.innerBuffer = ctx.allocateFrame();
+        this.appender.reset(outBuffer, true);
+        this.outBuffers = new ArrayList<ByteBuffer>();
+        this.memSize = memSize;
+        this.ctx = ctx;
 
-		FileReference file = ctx.getJobletContext().createWorkspaceFile(
-				this.getClass().getSimpleName() + this.toString());
-		runFileWriter = new RunFileWriter(file, ctx.getIOManager());
-		runFileWriter.open();
-	}
+        FileReference file = ctx.getJobletContext().createWorkspaceFile(
+                this.getClass().getSimpleName() + this.toString());
+        runFileWriter = new RunFileWriter(file, ctx.getIOManager());
+        runFileWriter.open();
+    }
 
-	public void cache(ByteBuffer buffer) throws HyracksDataException {
-		runFileWriter.nextFrame(buffer);
-		System.out.println(runFileWriter.getFileSize());
-	}
+    public void cache(ByteBuffer buffer) throws HyracksDataException {
+        runFileWriter.nextFrame(buffer);
+        System.out.println(runFileWriter.getFileSize());
+    }
 
-	public void join(ByteBuffer outerBuffer, IFrameWriter writer)
-			throws HyracksDataException {
-		if (outBuffers.size() < memSize - 3) {
-			createAndCopyFrame(outerBuffer);
-			return;
-		}
-		if (currentMemSize < memSize - 3) {
-			reloadFrame(outerBuffer);
-			return;
-		}
-		for (ByteBuffer outBuffer : outBuffers) {
-			runFileReader = runFileWriter.createReader();
-			runFileReader.open();
-			while (runFileReader.nextFrame(innerBuffer)) {
-				blockJoin(outBuffer, innerBuffer, writer);
-			}
-			runFileReader.close();
-		}
-		currentMemSize = 0;
-		reloadFrame(outerBuffer);
-	}
+    public void join(ByteBuffer outerBuffer, IFrameWriter writer) throws HyracksDataException {
+        if (outBuffers.size() < memSize - 3) {
+            createAndCopyFrame(outerBuffer);
+            return;
+        }
+        if (currentMemSize < memSize - 3) {
+            reloadFrame(outerBuffer);
+            return;
+        }
+        for (ByteBuffer outBuffer : outBuffers) {
+            runFileReader = runFileWriter.createReader();
+            runFileReader.open();
+            while (runFileReader.nextFrame(innerBuffer)) {
+                blockJoin(outBuffer, innerBuffer, writer);
+            }
+            runFileReader.close();
+        }
+        currentMemSize = 0;
+        reloadFrame(outerBuffer);
+    }
 
-	private void createAndCopyFrame(ByteBuffer outerBuffer) {
-		ByteBuffer outerBufferCopy = ctx.allocateFrame();
-		FrameUtils.copy(outerBuffer, outerBufferCopy);
-		outBuffers.add(outerBufferCopy);
-		currentMemSize++;
-	}
+    private void createAndCopyFrame(ByteBuffer outerBuffer) {
+        ByteBuffer outerBufferCopy = ctx.allocateFrame();
+        FrameUtils.copy(outerBuffer, outerBufferCopy);
+        outBuffers.add(outerBufferCopy);
+        currentMemSize++;
+    }
 
-	private void reloadFrame(ByteBuffer outerBuffer) {
-		outBuffers.get(currentMemSize).clear();
-		FrameUtils.copy(outerBuffer, outBuffers.get(currentMemSize));
-		currentMemSize++;
-	}
+    private void reloadFrame(ByteBuffer outerBuffer) {
+        outBuffers.get(currentMemSize).clear();
+        FrameUtils.copy(outerBuffer, outBuffers.get(currentMemSize));
+        currentMemSize++;
+    }
 
-	private void blockJoin(ByteBuffer outerBuffer, ByteBuffer innerBuffer,
-			IFrameWriter writer) throws HyracksDataException {
-		accessorOuter.reset(outerBuffer);
-		accessorInner.reset(innerBuffer);
-		int tupleCount0 = accessorOuter.getTupleCount();
-		int tupleCount1 = accessorInner.getTupleCount();
+    private void blockJoin(ByteBuffer outerBuffer, ByteBuffer innerBuffer, IFrameWriter writer)
+            throws HyracksDataException {
+        accessorOuter.reset(outerBuffer);
+        accessorInner.reset(innerBuffer);
+        int tupleCount0 = accessorOuter.getTupleCount();
+        int tupleCount1 = accessorInner.getTupleCount();
 
-		for (int i = 0; i < tupleCount0; ++i) {
-			for (int j = 0; j < tupleCount1; ++j) {
-				int c = compare(accessorOuter, i, accessorInner, j);
-				if (c == 0) {
-					if (!appender.appendConcat(accessorOuter, i, accessorInner,
-							j)) {
-						flushFrame(outBuffer, writer);
-						appender.reset(outBuffer, true);
-						if (!appender.appendConcat(accessorOuter, i,
-								accessorInner, j)) {
-							throw new IllegalStateException();
-						}
-					}
-				}
-			}
-		}
-	}
+        for (int i = 0; i < tupleCount0; ++i) {
+            for (int j = 0; j < tupleCount1; ++j) {
+                int c = compare(accessorOuter, i, accessorInner, j);
+                if (c == 0) {
+                    if (!appender.appendConcat(accessorOuter, i, accessorInner, j)) {
+                        flushFrame(outBuffer, writer);
+                        appender.reset(outBuffer, true);
+                        if (!appender.appendConcat(accessorOuter, i, accessorInner, j)) {
+                            throw new IllegalStateException();
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	public void closeCache() throws HyracksDataException {
-		if (runFileWriter != null) {
-			runFileWriter.close();
-		}
-	}
+    public void closeCache() throws HyracksDataException {
+        if (runFileWriter != null) {
+            runFileWriter.close();
+        }
+    }
 
-	public void closeJoin(IFrameWriter writer) throws HyracksDataException {
-		for (ByteBuffer outBuffer : outBuffers) {
-			runFileReader = runFileWriter.createReader();
-			runFileReader.open();
-			while (runFileReader.nextFrame(innerBuffer)) {
-				blockJoin(outBuffer, innerBuffer, writer);
-			}
-			runFileReader.close();
-		}
-		outBuffers.clear();
-		currentMemSize = 0;
+    public void closeJoin(IFrameWriter writer) throws HyracksDataException {
+        for (ByteBuffer outBuffer : outBuffers) {
+            runFileReader = runFileWriter.createReader();
+            runFileReader.open();
+            while (runFileReader.nextFrame(innerBuffer)) {
+                blockJoin(outBuffer, innerBuffer, writer);
+            }
+            runFileReader.close();
+        }
+        outBuffers.clear();
+        currentMemSize = 0;
 
-		if (appender.getTupleCount() > 0) {
-			flushFrame(outBuffer, writer);
-		}
-	}
+        if (appender.getTupleCount() > 0) {
+            flushFrame(outBuffer, writer);
+        }
+    }
 
-	private void flushFrame(ByteBuffer buffer, IFrameWriter writer)
-			throws HyracksDataException {
-		buffer.position(0);
-		buffer.limit(buffer.capacity());
-		writer.nextFrame(buffer);
-		buffer.position(0);
-		buffer.limit(buffer.capacity());
-	}
+    private void flushFrame(ByteBuffer buffer, IFrameWriter writer) throws HyracksDataException {
+        buffer.position(0);
+        buffer.limit(buffer.capacity());
+        writer.nextFrame(buffer);
+        buffer.position(0);
+        buffer.limit(buffer.capacity());
+    }
 
-	private int compare(FrameTupleAccessor accessor0, int tIndex0,
-			FrameTupleAccessor accessor1, int tIndex1)
-			throws HyracksDataException {
-		int c = tpComparator.compare(accessor0, tIndex0, accessor1, tIndex1);
-		if (c != 0) {
-			return c;
-		}
-		return 0;
-	}
+    private int compare(FrameTupleAccessor accessor0, int tIndex0, FrameTupleAccessor accessor1, int tIndex1)
+            throws HyracksDataException {
+        int c = tpComparator.compare(accessor0, tIndex0, accessor1, tIndex1);
+        if (c != 0) {
+            return c;
+        }
+        return 0;
+    }
 }
diff --git a/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java b/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java
index 108e6a9..1436e30 100644
--- a/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java
+++ b/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/NestedLoopJoinOperatorDescriptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2009-2010 by The Regents of the University of California
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * you may obtain a copy of the License from
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package edu.uci.ics.hyracks.dataflow.std.join;
 
 import java.nio.ByteBuffer;