diff --git a/stocks/src/test/java/org/springframework/amqp/rabbit/stocks/Client.java b/stocks/src/test/java/org/springframework/amqp/rabbit/stocks/Client.java
index 94131f7..fde50d8 100644
--- a/stocks/src/test/java/org/springframework/amqp/rabbit/stocks/Client.java
+++ b/stocks/src/test/java/org/springframework/amqp/rabbit/stocks/Client.java
@@ -13,53 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.amqp.rabbit.stocks;
 
+package org.springframework.amqp.rabbit.stocks;
 
 import javax.swing.JFrame;
 
-import org.apache.commons.logging.Log; 
-import org.apache.commons.logging.LogFactory; 
-
 import org.junit.Test;
+
 import org.springframework.amqp.rabbit.stocks.ui.StockController;
 import org.springframework.amqp.rabbit.stocks.ui.StockPanel;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
- * Main client application, can run as app or unit test.
+ * Main client application, can run as an application or unit test.
+ * 
  * @author Mark Pollack
- *
  */
 public class Client {
 
-	private static Log log = LogFactory.getLog(Client.class);
-	
-	/**
-	 * @param args
-	 */
 	public static void main(String[] args) {
 		new Client().run();
 	}
-	
+
 	@Test
 	public void run() {
-		
-		ConfigurableApplicationContext ac =	new ClassPathXmlApplicationContext("client-bootstrap-config.xml");
-		
-		StockController controller = ac.getBean(StockController.class);
-		
+		ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("client-bootstrap-config.xml");
+		StockController controller = context.getBean(StockController.class);
 		JFrame f = new JFrame("Rabbit Stock Demo");
 	    f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-	    
 	    //TODO consider @Configurable
 	    f.add(new StockPanel(controller));
 	    f.pack();
 	    f.setVisible(true);	    	
 	}
 
-	
-
-
 }