diff --git a/src/main/java/org/takes/facets/auth/Identity.java b/src/main/java/org/takes/facets/auth/Identity.java
index 1aaf07ade9..d28d3a6181 100644
--- a/src/main/java/org/takes/facets/auth/Identity.java
+++ b/src/main/java/org/takes/facets/auth/Identity.java
@@ -88,7 +88,7 @@ public String urn() {
 
         @Override
         public Map<String, String> properties() {
-            return Collections.unmodifiableMap(this.props);
+            return (this.props);
         }
     }
 
diff --git a/src/main/java/org/takes/facets/auth/PsToken.java b/src/main/java/org/takes/facets/auth/PsToken.java
index 764fcec8c4..0c48296b21 100644
--- a/src/main/java/org/takes/facets/auth/PsToken.java
+++ b/src/main/java/org/takes/facets/auth/PsToken.java
@@ -98,7 +98,7 @@ private PsToken(final SiHmac sign, final long seconds) {
     @Override
     public Opt<Identity> enter(final Request req) throws IOException {
         // @checkstyle ExecutableStatementCount (100 lines)
-        Opt<Identity> user = new Opt.Empty<>();
+        final Opt<Identity> user = new Opt.Empty<>();
         final UncheckedText head = new Unchecked<>(
             new FirstOf<>(
                 text -> new StartsWith(
@@ -139,7 +139,7 @@ public Opt<Identity> enter(final Request req) throws IOException {
                         )
                     )
                 )) {
-                    user = new Opt.Single<>(
+                    return new Opt.Single<>(
                         new Identity.Simple(
                             rdr.readObject().getString(Token.Jwt.SUBJECT)
                         )
diff --git a/src/main/java/org/takes/facets/auth/social/XeGithubLink.java b/src/main/java/org/takes/facets/auth/social/XeGithubLink.java
index 91f10773ba..fe7223d6be 100644
--- a/src/main/java/org/takes/facets/auth/social/XeGithubLink.java
+++ b/src/main/java/org/takes/facets/auth/social/XeGithubLink.java
@@ -46,7 +46,7 @@ public XeGithubLink(final Request req, final CharSequence app)
      */
     public XeGithubLink(final Request req, final CharSequence app,
         final CharSequence rel, final CharSequence flag) throws IOException {
-        super(XeGithubLink.make(req, app, rel, flag));
+        super(make(req, app, rel, flag));
     }
 
     /**
diff --git a/src/main/java/org/takes/facets/fork/FkChain.java b/src/main/java/org/takes/facets/fork/FkChain.java
index 2108ca551d..1949233d51 100644
--- a/src/main/java/org/takes/facets/fork/FkChain.java
+++ b/src/main/java/org/takes/facets/fork/FkChain.java
@@ -48,12 +48,11 @@ public FkChain(final Collection<Fork> forks) {
 
     @Override
     public Opt<Response> route(final Request request) throws Exception {
-        Opt<Response> response = new Opt.Empty<>();
+        final Opt<Response> response = new Opt.Empty<>();
         for (final Fork fork : this.forks) {
             final Opt<Response> current = fork.route(request);
             if (current.has()) {
-                response = current;
-                break;
+                return current;
             }
         }
         return response;