diff --git a/myapp/src/main/java/com/com1028/cw/mt00969/Customer.java b/myapp/src/main/java/com/com1028/cw/mt00969/Customer.java
index f500195078a9991f0234bf3286c6227e5ed9f29d..deae3da552bdd7519a8f67f013b39b3d06dd51a0 100644
--- a/myapp/src/main/java/com/com1028/cw/mt00969/Customer.java
+++ b/myapp/src/main/java/com/com1028/cw/mt00969/Customer.java
@@ -5,13 +5,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- *
- * select customerName,city,salesRepEmployeeNumber from customers where
- * salesRepEmployeeNumber is null ORDER BY customerNumber asc;
- *
- */
-
 public class Customer {
 
 	private int customerNumber = 0;
@@ -71,7 +64,7 @@ public class Customer {
 		for (Customer c : customers) {
 			if (c.getSalesRepEmployeeNumber() == 0) {
 
-				out += "\ncustomerName: " + c.getCustomerName() + "\n" + "contactFullName: " + c.getContactFirstName()
+				out += "\nCustomerName: " + c.getCustomerName() + "\n" + "ContactFullName: " + c.getContactFirstName()
 						+ c.getContactLastName() + "\n" + "City: " + c.getCity() + "\n" + "PhoneNumber: " + c.getPhone()
 						+ "\n";
 				counter++;
diff --git a/myapp/src/main/java/com/com1028/cw/mt00969/Order.java b/myapp/src/main/java/com/com1028/cw/mt00969/Order.java
index 114670f1c2e41e320feb6384c1c56f739c39eb65..8eb44700fd8b6803ee7af22a67499ef259ed164a 100644
--- a/myapp/src/main/java/com/com1028/cw/mt00969/Order.java
+++ b/myapp/src/main/java/com/com1028/cw/mt00969/Order.java
@@ -17,17 +17,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * 
- * version 2: select customers.customerNumber, customers.customerName,
- * round(avg(TIMESTAMPDIFF(DAY,orderDate,shippedDate)),2)
- * as'AverageDeliveryTimeInDays' from orders inner join customers on
- * customers.customerNumber = orders.customerNumber where shippedDate is not
- * null group by orders.customerNumber order by AverageDeliveryTimeInDays desc,
- * customerNumber asc;
- * 
- */
-
 public class Order {
 
 	private int orderNumber;
diff --git a/myapp/src/main/java/com/com1028/cw/mt00969/Payment.java b/myapp/src/main/java/com/com1028/cw/mt00969/Payment.java
index e6b1c20951d6ce61aae3cdc179c0c02786ba4b2a..9ab2710e90bcfb241402324b6943e5d61f8db852 100644
--- a/myapp/src/main/java/com/com1028/cw/mt00969/Payment.java
+++ b/myapp/src/main/java/com/com1028/cw/mt00969/Payment.java
@@ -8,15 +8,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-/**
- * 
- * version 2: select customers.customerNumber, customerName,
- * FORMAT(payments.amount, 'C') as 'Amount($)' from customers inner join
- * payments on payments.customerNumber=customers.customerNumber where
- * payments.amount > 100000 order by amount desc;
- * 
- */
-
 public class Payment {
 
 	private int customerNumber = 0;
@@ -74,9 +65,9 @@ public class Payment {
 				if (p.getAmount() > 100000) {
 					if (c.getCustomerNumber() == p.getCustomerNumber()) {
 
-						out += "customerNumber: " + p.getCustomerNumber() + "\n" + "customerName: "
-								+ c.getCustomerName() + "\n" + "contactFullName: " + c.getContactFirstName() + " "
-								+ c.getContactLastName() + "\n" + "amount: $" + df.format((p.getAmount())) + "\n\n";
+						out += "CustomerNumber: " + p.getCustomerNumber() + "\n" + "CustomerName: "
+								+ c.getCustomerName() + "\n" + "ContactFullName: " + c.getContactFirstName() + " "
+								+ c.getContactLastName() + "\n" + "Amount: $" + df.format((p.getAmount())) + "\n\n";
 						counter++;
 					}
 				}
diff --git a/myapp/src/test/java/com/com1028/cw/mt00969/RequirementTests.java b/myapp/src/test/java/com/com1028/cw/mt00969/RequirementTests.java
index 20bfde90363a4d0c51f2195aa234142abc06f2c4..9322a8047490bec932382026dd6f8e3973d9dd12 100644
--- a/myapp/src/test/java/com/com1028/cw/mt00969/RequirementTests.java
+++ b/myapp/src/test/java/com/com1028/cw/mt00969/RequirementTests.java
@@ -51,7 +51,7 @@ public class RequirementTests {
 
 			while (results.next()) {
 
-				Result += "\ncustomerName: " + results.getString("customerName") + "\n" + "contactFullName: "
+				Result += "\nCustomerName: " + results.getString("customerName") + "\n" + "ContactFullName: "
 						+ results.getString("contactFirstName") + results.getString("contactLastName") + "\n" + "City: "
 						+ results.getString("city") + "\n" + "PhoneNumber: " + results.getString("phone") + "\n";
 
@@ -100,10 +100,10 @@ public class RequirementTests {
 
 			while (results.next()) {
 
-				Result += "customerNumber: " + results.getInt("customers.customerNumber") + "\n" + "customerName: "
-						+ results.getString("customerName") + "\n" + "contactFullName: "
+				Result += "CustomerNumber: " + results.getInt("customers.customerNumber") + "\n" + "CustomerName: "
+						+ results.getString("customerName") + "\n" + "ContactFullName: "
 						+ results.getString("contactFirstName") + " " + results.getString("contactLastName") + "\n"
-						+ "amount: $" + results.getString("amount") + "\n\n";
+						+ "Amount: $" + results.getString("amount") + "\n\n";
 
 				counter = results.getInt("total");