diff --git a/src/com/bytezone/diskbrowser/visicalc/And.java b/src/com/bytezone/diskbrowser/visicalc/And.java
index 576df4e..57d0d64 100644
--- a/src/com/bytezone/diskbrowser/visicalc/And.java
+++ b/src/com/bytezone/diskbrowser/visicalc/And.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class And extends Function
+class And extends Function
 {
 
   public And (Sheet parent, String text)
diff --git a/src/com/bytezone/diskbrowser/visicalc/Cell.java b/src/com/bytezone/diskbrowser/visicalc/Cell.java
index 1d5f2af..362de55 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Cell.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Cell.java
@@ -83,7 +83,7 @@ class Cell implements Comparable<Cell>, Value
         expressionText = "15";
 
     // CARLOAN.VC
-    if (true)
+    if (false)
       if (address.sortValue == 67)
         expressionText = "9375";
       else if (address.sortValue == 131)
diff --git a/src/com/bytezone/diskbrowser/visicalc/Condition.java b/src/com/bytezone/diskbrowser/visicalc/Condition.java
index 7bb2697..954c171 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Condition.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Condition.java
@@ -1,8 +1,8 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class Condition
+class Condition
 {
-  private static String[] comparators = { "<>", "<=", ">=", "=", "<", ">" };
+  private static final String[] comparators = { "<>", "<=", ">=", "=", "<", ">" };
 
   private final Sheet parent;
 
diff --git a/src/com/bytezone/diskbrowser/visicalc/Count.java b/src/com/bytezone/diskbrowser/visicalc/Count.java
index 80606d2..405f711 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Count.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Count.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class Count extends Function
+class Count extends Function
 {
   private final Range range;
   private boolean hasChecked;
diff --git a/src/com/bytezone/diskbrowser/visicalc/Error.java b/src/com/bytezone/diskbrowser/visicalc/Error.java
index 8297f25..d8cad81 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Error.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Error.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class Error extends Function
+class Error extends Function
 {
   public Error (Sheet parent, String text)
   {
diff --git a/src/com/bytezone/diskbrowser/visicalc/Expression.java b/src/com/bytezone/diskbrowser/visicalc/Expression.java
index c6ceab6..f83fe87 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Expression.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Expression.java
@@ -3,7 +3,7 @@ package com.bytezone.diskbrowser.visicalc;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Expression implements Value
+class Expression implements Value
 {
   // Expressions:
   //   number
diff --git a/src/com/bytezone/diskbrowser/visicalc/If.java b/src/com/bytezone/diskbrowser/visicalc/If.java
index 145d6df..6b72de0 100644
--- a/src/com/bytezone/diskbrowser/visicalc/If.java
+++ b/src/com/bytezone/diskbrowser/visicalc/If.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class If extends Function
+class If extends Function
 {
   private final Condition condition;
   private final String textTrue;
diff --git a/src/com/bytezone/diskbrowser/visicalc/IsError.java b/src/com/bytezone/diskbrowser/visicalc/IsError.java
index e600133..8077342 100644
--- a/src/com/bytezone/diskbrowser/visicalc/IsError.java
+++ b/src/com/bytezone/diskbrowser/visicalc/IsError.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class IsError extends Function
+class IsError extends Function
 {
   boolean firstTime = true;
   Cell cell;
diff --git a/src/com/bytezone/diskbrowser/visicalc/Lookup.java b/src/com/bytezone/diskbrowser/visicalc/Lookup.java
index 7012e2a..4b8bc90 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Lookup.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Lookup.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class Lookup extends Function
+class Lookup extends Function
 {
   Range range;
   boolean hasValue;
diff --git a/src/com/bytezone/diskbrowser/visicalc/Max.java b/src/com/bytezone/diskbrowser/visicalc/Max.java
index 04ca6a0..ce7a733 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Max.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Max.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class Max extends Function
+class Max extends Function
 {
   private final Range range;
   private boolean hasChecked;
diff --git a/src/com/bytezone/diskbrowser/visicalc/Min.java b/src/com/bytezone/diskbrowser/visicalc/Min.java
index 3cbe645..5cd3dde 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Min.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Min.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class Min extends Function
+class Min extends Function
 {
   private final Range range;
   private boolean hasChecked;
diff --git a/src/com/bytezone/diskbrowser/visicalc/Or.java b/src/com/bytezone/diskbrowser/visicalc/Or.java
index 94d869e..1d475a9 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Or.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Or.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class Or extends Function
+class Or extends Function
 {
 
   public Or (Sheet parent, String text)
diff --git a/src/com/bytezone/diskbrowser/visicalc/Sum.java b/src/com/bytezone/diskbrowser/visicalc/Sum.java
index 84020dc..08f1643 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Sum.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Sum.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public class Sum extends Function
+class Sum extends Function
 {
   private final Range range;
   private boolean hasChecked;
diff --git a/src/com/bytezone/diskbrowser/visicalc/Value.java b/src/com/bytezone/diskbrowser/visicalc/Value.java
index 8d652d2..ca3ee74 100644
--- a/src/com/bytezone/diskbrowser/visicalc/Value.java
+++ b/src/com/bytezone/diskbrowser/visicalc/Value.java
@@ -1,6 +1,6 @@
 package com.bytezone.diskbrowser.visicalc;
 
-public interface Value
+interface Value
 {
   public boolean hasValue ();