diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowResponseStateManager.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowResponseStateManager.java
index 18caa645..736a8065 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowResponseStateManager.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowResponseStateManager.java
@@ -32,10 +32,10 @@ import org.springframework.webflow.execution.RequestContextHolder;
 /**
  * A custom ResponseStateManager that writes JSF state to a Web Flow managed view-scoped variable. This class is plugged
  * in via {@link FlowRenderKit}.
- * 
+ *
  * @author Rossen Stoyanchev
  * @author Phillip Webb
- * 
+ *
  * @since 2.2.0
  */
 public class FlowResponseStateManager extends ResponseStateManagerWrapper {
@@ -56,6 +56,7 @@ public class FlowResponseStateManager extends ResponseStateManagerWrapper {
 		this.wrapped = wrapped;
 	}
 
+	@Override
 	public ResponseStateManager getWrapped() {
 		return this.wrapped;
 	}
@@ -112,7 +113,7 @@ public class FlowResponseStateManager extends ResponseStateManagerWrapper {
 
 	/**
 	 * See comments on {@link ResponseStateManager#VIEW_STATE_PARAM}.
-	 * 
+	 *
 	 * @param context the <code>FacesContext</code> for the current request
 	 * @param writer the <code>ResponseWriter</code> to write to
 	 * @throws IOException if an error occurs writing to the client
@@ -126,7 +127,7 @@ public class FlowResponseStateManager extends ResponseStateManagerWrapper {
 	/**
 	 * See comments on <code>ResponseStateManager.RENDER_KIT_ID_PARAM</code> in
 	 * {@link ResponseStateManager#writeState(FacesContext, Object)}.
-	 * 
+	 *
 	 * @param context the <code>FacesContext</code> for the current request
 	 * @param writer the <code>ResponseWriter</code> to write to
 	 * @throws IOException if an error occurs writing to the client
diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
index 0cc6176e..82eba121 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
@@ -70,7 +70,7 @@ public class JsfViewFactory implements ViewFactory {
 	 * be rendered in the case of an executing transition.
 	 */
 	public View getView(RequestContext context) {
-		FacesContext facesContext = FlowFacesContext.getCurrentInstance();
+		FacesContext facesContext = FacesContext.getCurrentInstance();
 		Assert.state(
 				facesContext != null,
 				"FacesContext has not been initialized within the current Web Flow request."
@@ -117,7 +117,7 @@ public class JsfViewFactory implements ViewFactory {
 
 	private boolean viewAlreadySet(FacesContext facesContext, String viewName) {
 		// the corner case where a before RESTORE_VIEW PhaseListener has handled setting the UIViewRoot
-		return (facesContext.getViewRoot() != null && facesContext.getViewRoot().getViewId().equals(viewName));
+		return facesContext.getViewRoot() != null && facesContext.getViewRoot().getViewId().equals(viewName);
 	}
 
 	private UIViewRoot getViewRootForAlreadySetView(RequestContext context, FacesContext facesContext) {