diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
index 6186598..0d73576 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
@@ -19,7 +19,6 @@ package org.springframework.amqp.rabbit.stocks.config.client;
 
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
-
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
@@ -57,7 +56,7 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 	
 	/**
 	 * The client's template will by default send to the exchange defined 
-	 * in {@link AbstractRabbitConfiguration.rabbitTemplate()}
+	 * in {@link org.springframework.amqp.rabbit.config.AbstractRabbitConfiguration#rabbitTemplate()}
 	 * with the routing key {@link AbstractStockAppRabbitConfiguration#STOCK_REQUEST_QUEUE_NAME}
 	 * <p>
 	 * The default exchange will delivery to a queue whose name matches the routing key value.
@@ -110,7 +109,6 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 	
 	/**
 	 * Binds to the market data exchange. Interested in any stock quotes.
-	 * @return
 	 */	
 	@Bean
 	public Binding marketDataBinding() {		
diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/ExecutionVenueService.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/ExecutionVenueService.java
index 7896ca9..51d4b81 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/ExecutionVenueService.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/ExecutionVenueService.java
@@ -19,10 +19,11 @@ import org.springframework.amqp.rabbit.stocks.domain.TradeRequest;
 import org.springframework.amqp.rabbit.stocks.domain.TradeResponse;
 
 /**
- * Executes the trade request, creating a Trade response.  See the code flow in {@link ServerHandler} for
- * its usage.
- * @author Mark Pollack
+ * Executes the trade request, creating a Trade response.  See the
+ * code flow in {@link org.springframework.amqp.rabbit.stocks.handler.ServerHandler}
+ * for its usage.
  *
+ * @author Mark Pollack
  */
 public interface ExecutionVenueService {
 
diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/TradingService.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/TradingService.java
index e3889ad..a371746 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/TradingService.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/service/TradingService.java
@@ -20,12 +20,13 @@ import org.springframework.amqp.rabbit.stocks.domain.TradeResponse;
 
 /**
  * Trading Service to process trade requests and response.  This is the place to perform
- * any trade processing after executions.  See code flow in {@link ServerHandler}.
+ * any trade processing after executions.  See code flow in
+ * {@link org.springframework.amqp.rabbit.stocks.handler.ServerHandler}
  * 
  * @author Mark Pollack
- *
  */
 public interface TradingService {
 
 	void processTrade(TradeRequest request, TradeResponse response);
+
 }