diff --git a/app/build.gradle b/app/build.gradle
index 5bc0c224..849f3d55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ android {
         }
     }
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "com.fastaccess.github"
         minSdkVersion 21
@@ -112,6 +112,7 @@ repositories {
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     maven { url "https://jitpack.io" }
     maven { url 'https://maven.fabric.io/public' }
+    maven { url 'http://dl.bintray.com/kotlin/kotlin-eap-1.2' }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/fastaccess/data/dao/AccessTokenModel.java b/app/src/main/java/com/fastaccess/data/dao/AccessTokenModel.java
index 1322ebc9..2766fa0e 100644
--- a/app/src/main/java/com/fastaccess/data/dao/AccessTokenModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/AccessTokenModel.java
@@ -30,7 +30,7 @@ public class AccessTokenModel implements Parcelable {
         dest.writeString(this.tokenType);
     }
 
-    protected AccessTokenModel(Parcel in) {
+    private AccessTokenModel(Parcel in) {
         this.id = in.readLong();
         this.token = in.readString();
         this.hashedToken = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/AppLanguageModel.java b/app/src/main/java/com/fastaccess/data/dao/AppLanguageModel.java
index 1fbeb5b2..81350448 100644
--- a/app/src/main/java/com/fastaccess/data/dao/AppLanguageModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/AppLanguageModel.java
@@ -22,7 +22,7 @@ import lombok.Setter;
         dest.writeString(this.label);
     }
 
-    protected AppLanguageModel(Parcel in) {
+    private AppLanguageModel(Parcel in) {
         this.value = in.readString();
         this.label = in.readString();
     }
diff --git a/app/src/main/java/com/fastaccess/data/dao/AuthModel.java b/app/src/main/java/com/fastaccess/data/dao/AuthModel.java
index d347f281..a37d066e 100644
--- a/app/src/main/java/com/fastaccess/data/dao/AuthModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/AuthModel.java
@@ -40,7 +40,7 @@ public class AuthModel implements Parcelable {
         dest.writeString(this.otpCode);
     }
 
-    protected AuthModel(Parcel in) {
+    private AuthModel(Parcel in) {
         this.clientId = in.readString();
         this.clientSecret = in.readString();
         this.redirectUri = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/BranchesModel.java b/app/src/main/java/com/fastaccess/data/dao/BranchesModel.java
index 9e2c3a41..77a08db4 100644
--- a/app/src/main/java/com/fastaccess/data/dao/BranchesModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/BranchesModel.java
@@ -37,7 +37,7 @@ public class BranchesModel implements Parcelable {
         dest.writeByte(this.isTag ? (byte) 1 : (byte) 0);
     }
 
-    protected BranchesModel(Parcel in) {
+    private BranchesModel(Parcel in) {
         this.name = in.readString();
         this.commit = in.readParcelable(Commit.class.getClassLoader());
         this.protectedBranch = in.readByte() != 0;
diff --git a/app/src/main/java/com/fastaccess/data/dao/CommentRequestModel.java b/app/src/main/java/com/fastaccess/data/dao/CommentRequestModel.java
index 26ea4a7b..b7bb58fa 100644
--- a/app/src/main/java/com/fastaccess/data/dao/CommentRequestModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/CommentRequestModel.java
@@ -44,7 +44,7 @@ import lombok.Setter;
         dest.writeValue(this.line);
     }
 
-    protected CommentRequestModel(Parcel in) {
+    private CommentRequestModel(Parcel in) {
         this.body = in.readString();
         this.inReplyTo = (Long) in.readValue(Long.class.getClassLoader());
         this.path = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/CommitCountModel.java b/app/src/main/java/com/fastaccess/data/dao/CommitCountModel.java
index 22802147..8b74c785 100644
--- a/app/src/main/java/com/fastaccess/data/dao/CommitCountModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/CommitCountModel.java
@@ -26,7 +26,7 @@ import lombok.Setter;
 
     public CommitCountModel() {}
 
-    protected CommitCountModel(Parcel in) {
+    private CommitCountModel(Parcel in) {
         this.all = new ArrayList<Integer>();
         in.readList(this.all, Integer.class.getClassLoader());
         this.owner = new ArrayList<Integer>();
diff --git a/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java b/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java
index b297cfba..7a45c30a 100644
--- a/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java
+++ b/app/src/main/java/com/fastaccess/data/dao/CommitFileChanges.java
@@ -23,7 +23,7 @@ import lombok.Setter;
     public List<CommitLinesModel> linesModel;
     public CommitFileModel commitFileModel;
 
-    public CommitFileChanges() {}
+    private CommitFileChanges() {}
 
     public static Observable<CommitFileChanges> constructToObservable(@Nullable List<CommitFileModel> files) {
         if (files == null || files.isEmpty()) return Observable.empty();
@@ -56,7 +56,7 @@ import lombok.Setter;
         dest.writeParcelable(this.commitFileModel, flags);
     }
 
-    protected CommitFileChanges(Parcel in) {
+    private CommitFileChanges(Parcel in) {
         this.linesModel = in.createTypedArrayList(CommitLinesModel.CREATOR);
         this.commitFileModel = in.readParcelable(CommitFileModel.class.getClassLoader());
     }
diff --git a/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java b/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java
index 3591c298..9940b56c 100644
--- a/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/CommitLinesModel.java
@@ -100,7 +100,7 @@ import static com.fastaccess.ui.widgets.DiffLineSpan.HUNK_TITLE;
         dest.writeInt(this.position);
     }
 
-    protected CommitLinesModel(Parcel in) {
+    private CommitLinesModel(Parcel in) {
         this.text = in.readString();
         this.color = in.readInt();
         this.leftLineNo = in.readInt();
diff --git a/app/src/main/java/com/fastaccess/data/dao/EditReviewCommentModel.java b/app/src/main/java/com/fastaccess/data/dao/EditReviewCommentModel.java
index 62be6592..cba7d4b7 100644
--- a/app/src/main/java/com/fastaccess/data/dao/EditReviewCommentModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/EditReviewCommentModel.java
@@ -33,7 +33,7 @@ import lombok.Setter;
         dest.writeLong(this.inReplyTo);
     }
 
-    protected EditReviewCommentModel(Parcel in) {
+    private EditReviewCommentModel(Parcel in) {
         this.groupPosition = in.readInt();
         this.commentPosition = in.readInt();
         this.comment = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/FilesListModel.java b/app/src/main/java/com/fastaccess/data/dao/FilesListModel.java
index 7e20da76..2883f6f3 100644
--- a/app/src/main/java/com/fastaccess/data/dao/FilesListModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/FilesListModel.java
@@ -35,7 +35,7 @@ public class FilesListModel implements Parcelable, Serializable {
         dest.writeString(this.language);
     }
 
-    protected FilesListModel(Parcel in) {
+    private FilesListModel(Parcel in) {
         this.filename = in.readString();
         this.type = in.readString();
         this.rawUrl = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/FilterOptionsModel.java b/app/src/main/java/com/fastaccess/data/dao/FilterOptionsModel.java
index 83c61180..e74e4145 100644
--- a/app/src/main/java/com/fastaccess/data/dao/FilterOptionsModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/FilterOptionsModel.java
@@ -146,7 +146,7 @@ public class FilterOptionsModel implements Parcelable {
         dest.writeByte(this.isOrg ? (byte) 1 : (byte) 0);
     }
 
-    protected FilterOptionsModel(Parcel in) {
+    private FilterOptionsModel(Parcel in) {
         this.type = in.readString();
         this.sort = in.readString();
         this.sortDirection = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java b/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java
index 867a074d..515d3cb1 100644
--- a/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/GroupedNotificationModel.java
@@ -33,7 +33,7 @@ import static com.annimon.stream.Collectors.toList;
     private Notification notification;
     private Date date;
 
-    public GroupedNotificationModel(Repo repo) {
+    private GroupedNotificationModel(Repo repo) {
         this.type = HEADER;
         this.repo = repo;
     }
diff --git a/app/src/main/java/com/fastaccess/data/dao/GroupedReviewModel.java b/app/src/main/java/com/fastaccess/data/dao/GroupedReviewModel.java
index 88f83f21..a905fe59 100644
--- a/app/src/main/java/com/fastaccess/data/dao/GroupedReviewModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/GroupedReviewModel.java
@@ -36,7 +36,7 @@ import lombok.Setter;
         dest.writeTypedList(this.comments);
     }
 
-    protected GroupedReviewModel(Parcel in) {
+    private GroupedReviewModel(Parcel in) {
         this.position = in.readInt();
         this.diffText = in.readString();
         long tmpDate = in.readLong();
diff --git a/app/src/main/java/com/fastaccess/data/dao/ImgurReponseModel.java b/app/src/main/java/com/fastaccess/data/dao/ImgurReponseModel.java
index a029a08b..bd8d66e3 100644
--- a/app/src/main/java/com/fastaccess/data/dao/ImgurReponseModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/ImgurReponseModel.java
@@ -25,7 +25,7 @@ import lombok.Setter;
 
     public ImgurReponseModel() {}
 
-    protected ImgurReponseModel(Parcel in) {
+    private ImgurReponseModel(Parcel in) {
         this.success = in.readByte() != 0;
         this.status = in.readInt();
         this.data = in.readParcelable(ImgurImage.class.getClassLoader());
@@ -52,7 +52,7 @@ import lombok.Setter;
             dest.writeString(this.link);
         }
 
-        protected ImgurImage(Parcel in) {
+        private ImgurImage(Parcel in) {
             this.title = in.readString();
             this.description = in.readString();
             this.link = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java b/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java
index 70a11037..915df44b 100644
--- a/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/IssueEventAdapterModel.java
@@ -55,7 +55,7 @@ public class IssueEventAdapterModel implements Parcelable {
         dest.writeParcelable(this.issueModel, flags);
     }
 
-    protected IssueEventAdapterModel(Parcel in) {
+    private IssueEventAdapterModel(Parcel in) {
         this.type = in.readInt();
         this.issueEvent = in.readParcelable(IssueEvent.class.getClassLoader());
         this.issueModel = in.readParcelable(Issue.class.getClassLoader());
diff --git a/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java b/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java
index 8c012533..73a7a805 100644
--- a/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/IssueRequestModel.java
@@ -71,7 +71,7 @@ public class IssueRequestModel implements Parcelable {
         dest.writeStringList(this.labels);
     }
 
-    protected IssueRequestModel(Parcel in) {
+    private IssueRequestModel(Parcel in) {
         int tmpState = in.readInt();
         this.state = tmpState == -1 ? null : IssueState.values()[tmpState];
         this.title = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/LanguageColorModel.java b/app/src/main/java/com/fastaccess/data/dao/LanguageColorModel.java
index 15c89e64..2f40fc9a 100644
--- a/app/src/main/java/com/fastaccess/data/dao/LanguageColorModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/LanguageColorModel.java
@@ -24,7 +24,7 @@ import lombok.ToString;
 
     public LanguageColorModel() {}
 
-    protected LanguageColorModel(Parcel in) {
+    private LanguageColorModel(Parcel in) {
         this.color = in.readString();
         this.url = in.readString();
     }
diff --git a/app/src/main/java/com/fastaccess/data/dao/PostReactionModel.java b/app/src/main/java/com/fastaccess/data/dao/PostReactionModel.java
index 0a513f9a..46f428e8 100644
--- a/app/src/main/java/com/fastaccess/data/dao/PostReactionModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/PostReactionModel.java
@@ -20,7 +20,7 @@ import lombok.Setter;
 
     @Override public void writeToParcel(Parcel dest, int flags) {dest.writeString(this.content);}
 
-    protected PostReactionModel(Parcel in) {this.content = in.readString();}
+    private PostReactionModel(Parcel in) {this.content = in.readString();}
 
     public static final Parcelable.Creator<PostReactionModel> CREATOR = new Parcelable.Creator<PostReactionModel>() {
         @Override public PostReactionModel createFromParcel(Parcel source) {return new PostReactionModel(source);}
diff --git a/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java b/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java
index adb10254..92d2451f 100644
--- a/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/PullRequestAdapterModel.java
@@ -55,7 +55,7 @@ public class PullRequestAdapterModel implements Parcelable {
         dest.writeParcelable(this.pullRequest, flags);
     }
 
-    protected PullRequestAdapterModel(Parcel in) {
+    private PullRequestAdapterModel(Parcel in) {
         this.type = in.readInt();
         this.issueEvent = in.readParcelable(IssueEvent.class.getClassLoader());
         this.pullRequest = in.readParcelable(PullRequest.class.getClassLoader());
diff --git a/app/src/main/java/com/fastaccess/data/dao/ReviewRequestModel.java b/app/src/main/java/com/fastaccess/data/dao/ReviewRequestModel.java
index 7cfcc89d..df40f83c 100644
--- a/app/src/main/java/com/fastaccess/data/dao/ReviewRequestModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/ReviewRequestModel.java
@@ -27,7 +27,7 @@ import lombok.Setter;
         dest.writeTypedList(this.comments);
     }
 
-    protected ReviewRequestModel(Parcel in) {
+    private ReviewRequestModel(Parcel in) {
         this.commitId = in.readString();
         this.body = in.readString();
         this.event = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/SlackInvitePostModel.java b/app/src/main/java/com/fastaccess/data/dao/SlackInvitePostModel.java
index e7ca64c6..ee147436 100644
--- a/app/src/main/java/com/fastaccess/data/dao/SlackInvitePostModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/SlackInvitePostModel.java
@@ -25,7 +25,7 @@ import lombok.Setter;
 
     public SlackInvitePostModel() {}
 
-    protected SlackInvitePostModel(Parcel in) {
+    private SlackInvitePostModel(Parcel in) {
         this.email = in.readString();
         this.first_name = in.readString();
         this.last_name = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/SlackResponseModel.java b/app/src/main/java/com/fastaccess/data/dao/SlackResponseModel.java
index 72b7b08f..d30da669 100644
--- a/app/src/main/java/com/fastaccess/data/dao/SlackResponseModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/SlackResponseModel.java
@@ -23,7 +23,7 @@ import lombok.Setter;
 
     public SlackResponseModel() {}
 
-    protected SlackResponseModel(Parcel in) {
+    private SlackResponseModel(Parcel in) {
         this.ok = in.readByte() != 0;
         this.error = in.readString();
     }
diff --git a/app/src/main/java/com/fastaccess/data/dao/StatusesModel.java b/app/src/main/java/com/fastaccess/data/dao/StatusesModel.java
index 29c32fc4..adcda4e0 100644
--- a/app/src/main/java/com/fastaccess/data/dao/StatusesModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/StatusesModel.java
@@ -39,7 +39,7 @@ import lombok.Setter;
         dest.writeLong(this.updatedAt != null ? this.updatedAt.getTime() : -1);
     }
 
-    protected StatusesModel(Parcel in) {
+    private StatusesModel(Parcel in) {
         this.url = in.readString();
         this.id = in.readInt();
         int tmpState = in.readInt();
diff --git a/app/src/main/java/com/fastaccess/data/dao/WikiModel.java b/app/src/main/java/com/fastaccess/data/dao/WikiModel.java
index d84b543c..02c85ead 100644
--- a/app/src/main/java/com/fastaccess/data/dao/WikiModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/WikiModel.java
@@ -32,7 +32,7 @@ import lombok.Setter;
         dest.writeString(this.htmlUrl);
     }
 
-    protected WikiModel(Parcel in) {
+    private WikiModel(Parcel in) {
         this.pageName = in.readString();
         this.title = in.readString();
         this.summary = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/timeline/AuthorModel.java b/app/src/main/java/com/fastaccess/data/dao/timeline/AuthorModel.java
index 68713dc9..fc89b57b 100644
--- a/app/src/main/java/com/fastaccess/data/dao/timeline/AuthorModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/timeline/AuthorModel.java
@@ -23,7 +23,7 @@ import lombok.Setter;
         dest.writeLong(this.date != null ? this.date.getTime() : -1);
     }
 
-    protected AuthorModel(Parcel in) {
+    private AuthorModel(Parcel in) {
         this.name = in.readString();
         this.email = in.readString();
         long tmpDate = in.readLong();
diff --git a/app/src/main/java/com/fastaccess/data/dao/timeline/CommentEvent.java b/app/src/main/java/com/fastaccess/data/dao/timeline/CommentEvent.java
index 837576c6..4086a577 100644
--- a/app/src/main/java/com/fastaccess/data/dao/timeline/CommentEvent.java
+++ b/app/src/main/java/com/fastaccess/data/dao/timeline/CommentEvent.java
@@ -95,7 +95,7 @@ import lombok.Setter;
         dest.writeParcelable(this.reactions, flags);
     }
 
-    protected CommentEvent(Parcel in) {
+    private CommentEvent(Parcel in) {
         this.id = in.readLong();
         this.user = in.readParcelable(User.class.getClassLoader());
         this.url = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/timeline/ParentsModel.java b/app/src/main/java/com/fastaccess/data/dao/timeline/ParentsModel.java
index a0e546f6..9c091d98 100644
--- a/app/src/main/java/com/fastaccess/data/dao/timeline/ParentsModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/timeline/ParentsModel.java
@@ -21,7 +21,7 @@ import lombok.Setter;
 
     public ParentsModel() {}
 
-    protected ParentsModel(Parcel in) {
+    private ParentsModel(Parcel in) {
         this.sha = in.readString();
         this.url = in.readString();
         this.htmlUrl = in.readString();
diff --git a/app/src/main/java/com/fastaccess/data/dao/timeline/SourceModel.java b/app/src/main/java/com/fastaccess/data/dao/timeline/SourceModel.java
index 5eadd86d..3efcfe06 100644
--- a/app/src/main/java/com/fastaccess/data/dao/timeline/SourceModel.java
+++ b/app/src/main/java/com/fastaccess/data/dao/timeline/SourceModel.java
@@ -35,7 +35,7 @@ import lombok.Setter;
         dest.writeParcelable(this.repository, flags);
     }
 
-    protected SourceModel(Parcel in) {
+    private SourceModel(Parcel in) {
         this.type = in.readString();
         this.issue = in.readParcelable(Issue.class.getClassLoader());
         this.pullRequest = in.readParcelable(PullRequest.class.getClassLoader());
diff --git a/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt b/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt
index 4428ea5c..a8cc9162 100644
--- a/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt
+++ b/app/src/main/java/com/fastaccess/data/dao/wiki/WikiContentModel.kt
@@ -6,7 +6,7 @@ import android.os.Parcelable
 /**
  * Created by Kosh on 13 Jun 2017, 8:06 PM
  */
-data class WikiContentModel(val content: String? = null, val footer: String? = null,
+data class WikiContentModel(val content: String? = null, private val footer: String? = null,
                             val sidebar: ArrayList<WikiSideBarModel>) : Parcelable {
     companion object {
         @JvmField val CREATOR: Parcelable.Creator<WikiContentModel> = object : Parcelable.Creator<WikiContentModel> {
diff --git a/app/src/main/java/com/fastaccess/helper/Bundler.java b/app/src/main/java/com/fastaccess/helper/Bundler.java
index 8f682783..409819f0 100644
--- a/app/src/main/java/com/fastaccess/helper/Bundler.java
+++ b/app/src/main/java/com/fastaccess/helper/Bundler.java
@@ -185,7 +185,7 @@ public class Bundler {
     /**
      * Get the underlying start.
      */
-    public Bundle get() {
+    private Bundle get() {
         return bundle;
     }
 
diff --git a/app/src/main/java/com/fastaccess/helper/CustomTabsHelper.java b/app/src/main/java/com/fastaccess/helper/CustomTabsHelper.java
index e90232b5..722820ed 100644
--- a/app/src/main/java/com/fastaccess/helper/CustomTabsHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/CustomTabsHelper.java
@@ -12,7 +12,7 @@ import android.util.Log;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CustomTabsHelper {
+class CustomTabsHelper {
     private static final String TAG = "CustomTabsHelper";
     private static final String STABLE_PACKAGE = "com.android.chrome";
     private static final String BETA_PACKAGE = "com.chrome.beta";
diff --git a/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt b/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt
index dfdfc238..81477840 100644
--- a/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt
+++ b/app/src/main/java/com/fastaccess/provider/theme/ThemeEngine.kt
@@ -57,7 +57,7 @@ object ThemeEngine {
         setTaskDescription(activity)
     }
 
-    @StyleRes fun getTheme(themeMode: Int, themeColor: Int): Int {
+    @StyleRes private fun getTheme(themeMode: Int, themeColor: Int): Int {
         Logger.e(themeMode, themeColor)
         // I wish if I could simplify this :'( too many cases for the love of god.
         when (themeMode) {
@@ -156,7 +156,7 @@ object ThemeEngine {
         return R.style.ThemeLight
     }
 
-    @StyleRes fun getDialogTheme(themeMode: Int, themeColor: Int): Int {
+    @StyleRes private fun getDialogTheme(themeMode: Int, themeColor: Int): Int {
         when (themeMode) {
             PrefGetter.LIGHT -> when (themeColor) {
                 PrefGetter.RED -> return R.style.DialogThemeLight_Red
diff --git a/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java b/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java
index c8be02e4..3814968b 100644
--- a/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java
+++ b/app/src/main/java/com/fastaccess/provider/timeline/CommentsHelper.java
@@ -62,7 +62,7 @@ public class CommentsHelper {
         }
     }
 
-    public static String getEmojiByUnicode(int unicode) {
+    private static String getEmojiByUnicode(int unicode) {
         return new String(Character.toChars(unicode));
     }
 
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/IssuesTimelineAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/IssuesTimelineAdapter.java
index a8dc20e0..e22fa0b5 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/IssuesTimelineAdapter.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/IssuesTimelineAdapter.java
@@ -33,9 +33,9 @@ public class IssuesTimelineAdapter extends BaseRecyclerAdapter<TimelineModel, Ba
     private final String repoOwner;
     private final String poster;
 
-    public IssuesTimelineAdapter(@NonNull List<TimelineModel> data, OnToggleView onToggleView, boolean showEmojies,
-                                 ReactionsCallback reactionsCallback, boolean isMerged,
-                                 ReviewCommentCallback reviewCommentCallback, String repoOwner, String poster) {
+    private IssuesTimelineAdapter(@NonNull List<TimelineModel> data, OnToggleView onToggleView, boolean showEmojies,
+                                  ReactionsCallback reactionsCallback, boolean isMerged,
+                                  ReviewCommentCallback reviewCommentCallback, String repoOwner, String poster) {
         super(data);
         this.onToggleView = onToggleView;
         this.showEmojies = showEmojies;
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/LoginAdapter.kt b/app/src/main/java/com/fastaccess/ui/adapter/LoginAdapter.kt
index da012001..f554840e 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/LoginAdapter.kt
+++ b/app/src/main/java/com/fastaccess/ui/adapter/LoginAdapter.kt
@@ -9,7 +9,7 @@ import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder
 /**
  * Created by Kosh on 09 Jul 2017, 5:00 PM
  */
-class LoginAdapter constructor(val small: Boolean = false) : BaseRecyclerAdapter<Login, LoginViewHolder, BaseViewHolder.OnItemClickListener<Login>>() {
+class LoginAdapter constructor(private val small: Boolean = false) : BaseRecyclerAdapter<Login, LoginViewHolder, BaseViewHolder.OnItemClickListener<Login>>() {
 
     override fun onBindView(holder: LoginViewHolder, position: Int) {
         holder.bind(getItem(position))
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/PullRequestTimelineAdapter.kt b/app/src/main/java/com/fastaccess/ui/adapter/PullRequestTimelineAdapter.kt
index fbf48388..425c0859 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/PullRequestTimelineAdapter.kt
+++ b/app/src/main/java/com/fastaccess/ui/adapter/PullRequestTimelineAdapter.kt
@@ -15,12 +15,12 @@ import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder.OnItemClickListener
 /**
  * Created by kosh on 03/08/2017.
  */
-class PullRequestTimelineAdapter constructor(val data: ArrayList<PullRequestTimelineModel>,
-                                             internal var onToggleView: OnToggleView,
-                                             internal var reactionsCallback: ReactionsCallback,
+class PullRequestTimelineAdapter constructor(private val data: ArrayList<PullRequestTimelineModel>,
+                                             private var onToggleView: OnToggleView,
+                                             private var reactionsCallback: ReactionsCallback,
                                              internal var isMerged: Boolean = false,
-                                             internal var repoOwner: String,
-                                             internal var poster: String) : BaseRecyclerAdapter<PullRequestTimelineModel,
+                                             private var repoOwner: String,
+                                             private var poster: String) : BaseRecyclerAdapter<PullRequestTimelineModel,
         BaseViewHolder<PullRequestTimelineModel>, OnItemClickListener<PullRequestTimelineModel>>(data) {
 
     override fun viewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder<PullRequestTimelineModel> {
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LoginViewHolder.kt b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LoginViewHolder.kt
index d5600260..3afcb1c4 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LoginViewHolder.kt
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LoginViewHolder.kt
@@ -19,8 +19,8 @@ import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder
 
 class LoginViewHolder private constructor(itemView: View, adapter: BaseRecyclerAdapter<*, *, *>?) :
         BaseViewHolder<Login>(itemView, adapter) {
-    val avatarLayout: AvatarLayout? by bindOptionalView(R.id.avatarLayout)
-    val title: FontTextView by bindView(R.id.title)
+    private val avatarLayout: AvatarLayout? by bindOptionalView(R.id.avatarLayout)
+    private val title: FontTextView by bindView(R.id.title)
 
     @SuppressLint("SetTextI18n")
     override fun bind(login: Login) {
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestEventViewHolder.kt b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestEventViewHolder.kt
index c4ecb5cb..2a61c4a0 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestEventViewHolder.kt
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/PullRequestEventViewHolder.kt
@@ -26,7 +26,7 @@ import pr.PullRequestTimelineQuery
  * Created by kosh on 03/08/2017.
  */
 
-class PullRequestEventViewHolder private constructor(val view: View, adapter: BaseRecyclerAdapter<*, *, *>) :
+class PullRequestEventViewHolder private constructor(private val view: View, adapter: BaseRecyclerAdapter<*, *, *>) :
         BaseViewHolder<PullRequestTimelineModel>(view, adapter) {
 
     @BindView(R.id.stateImage) lateinit var stateImage: ForegroundImageView
@@ -68,7 +68,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append("unlocked this conversation")
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_lock)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -84,7 +84,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append(event.label().name(), CodeSpan(color, ViewHelper.generateTextColor(color), 5.0f))
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_label)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -99,7 +99,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append(event.user()?.login())
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_profile)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -112,7 +112,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append("reopened this")
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_issue_opened)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -126,7 +126,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append("changed the title from").append(" ").append(event.previousTitle())
                     .append(" ").append("to").append(" ").bold(event.currentTitle())
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_edit)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -159,7 +159,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                         event.commitRepository().nameWithOwner()
                     })
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_push)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -174,7 +174,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append(event.milestoneTitle()).append(" ").append("milestone")
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_milestone)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -195,7 +195,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(":")
                     .append(event.mergeRefName(), BackgroundColorSpan(HtmlHelper.getWindowBackground(PrefGetter.getThemeType())))
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_merge)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -208,7 +208,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append("locked and limited conversation to collaborators")
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_lock)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -224,7 +224,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append(event.label().name(), CodeSpan(color, ViewHelper.generateTextColor(color), 5.0f))
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_label)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -243,7 +243,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append("branch")
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_push)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -258,7 +258,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .url(substring(event.afterCommit().oid().toString()))
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_push)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -277,7 +277,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append("branch")
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_trash)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -292,7 +292,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append(event.deployment().latestStatus()?.state()?.name)
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_push)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -307,7 +307,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append(event.milestoneTitle()).append(" ").append("milestone")
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_milestone)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -324,7 +324,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .url(substring(event.oid().toString()))
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.committedDate()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.committedDate().toString())))
             stateImage.setImageResource(R.drawable.ic_push)
             avatarLayout.setUrl(it.user()?.avatarUrl().toString(), it.user()?.login(), false,
                     LinkParserHelper.isEnterprise(it.user()?.url().toString()))
@@ -340,7 +340,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .url(substring(event.commit()?.oid()?.toString()))
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_merge)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -355,7 +355,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .url(substring(event.afterCommit().oid().toString()))
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_push)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
@@ -370,7 +370,7 @@ class PullRequestEventViewHolder private constructor(val view: View, adapter: Ba
                     .append(" ")
                     .append(event.user()?.login())
                     .append(" ")
-                    .append(ParseDateFormat.getTimeAgo((event.createdAt()?.toString())))
+                    .append(ParseDateFormat.getTimeAgo((event.createdAt().toString())))
             stateImage.setImageResource(R.drawable.ic_profile)
             avatarLayout.setUrl(it.avatarUrl().toString(), it.login(), false, LinkParserHelper.isEnterprise(it.url().toString()))
         }
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TrendingViewHolder.kt b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TrendingViewHolder.kt
index 8f4e8ed8..67533a89 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TrendingViewHolder.kt
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TrendingViewHolder.kt
@@ -18,12 +18,12 @@ import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder
 open class TrendingViewHolder(itemView: View, adapter: BaseRecyclerAdapter<TrendingModel,
         TrendingViewHolder, OnItemClickListener<TrendingModel>>) : BaseViewHolder<TrendingModel>(itemView, adapter) {
 
-    val title: FontTextView by bindView(R.id.title)
-    val description: FontTextView by bindView(R.id.description)
-    val todayStars: FontTextView by bindView(R.id.todayStars)
-    val stars: FontTextView by bindView(R.id.stars)
-    val fork: FontTextView by bindView(R.id.forks)
-    val lang: FontTextView by bindView(R.id.language)
+    private val title: FontTextView by bindView(R.id.title)
+    private val description: FontTextView by bindView(R.id.description)
+    private val todayStars: FontTextView by bindView(R.id.todayStars)
+    private val stars: FontTextView by bindView(R.id.stars)
+    private val fork: FontTextView by bindView(R.id.forks)
+    private val lang: FontTextView by bindView(R.id.language)
 
     override fun bind(t: TrendingModel) {
         title.text = t.title
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/UnknownTypeViewHolder.kt b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/UnknownTypeViewHolder.kt
index e2d0d440..6fe1a3cf 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/UnknownTypeViewHolder.kt
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/UnknownTypeViewHolder.kt
@@ -6,6 +6,6 @@ import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder
 /**
  * Created by kosh on 07/08/2017.
  */
-class UnknownTypeViewHolder(val view: View) : BaseViewHolder<Any>(view) {
+class UnknownTypeViewHolder(private val view: View) : BaseViewHolder<Any>(view) {
     override fun bind(t: Any) {} //DO NOTHING
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
index 0fb10620..b3a60310 100644
--- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
@@ -63,9 +63,9 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
         BaseMvp.FAView, NavigationView.OnNavigationItemSelectedListener {
 
     @State boolean isProgressShowing;
-    @Nullable @BindView(R.id.toolbar) public Toolbar toolbar;
-    @Nullable @BindView(R.id.appbar) public AppBarLayout appbar;
-    @Nullable @BindView(R.id.drawer) public DrawerLayout drawer;
+    @Nullable @BindView(R.id.toolbar) protected Toolbar toolbar;
+    @Nullable @BindView(R.id.appbar) protected AppBarLayout appbar;
+    @Nullable @BindView(R.id.drawer) protected DrawerLayout drawer;
     @Nullable @BindView(R.id.extrasNav) public NavigationView extraNav;
     @Nullable @BindView(R.id.accountsNav) NavigationView accountsNav;
 
diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseBottomSheetDialog.java b/app/src/main/java/com/fastaccess/ui/base/BaseBottomSheetDialog.java
index d857e796..def0cc07 100644
--- a/app/src/main/java/com/fastaccess/ui/base/BaseBottomSheetDialog.java
+++ b/app/src/main/java/com/fastaccess/ui/base/BaseBottomSheetDialog.java
@@ -132,6 +132,6 @@ import butterknife.Unbinder;
 
     protected void onDismissedByScrolling() {}
 
-    protected void onDialogIsShowing() {}
+    private void onDialogIsShowing() {}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt b/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt
index cf2388d5..7b1af6ea 100644
--- a/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt
+++ b/app/src/main/java/com/fastaccess/ui/base/MainNavDrawer.kt
@@ -33,14 +33,14 @@ import com.fastaccess.ui.widgets.recyclerview.DynamicRecyclerView
 /**
  * Created by Kosh on 09 Jul 2017, 3:50 PM
  */
-class MainNavDrawer(val view: BaseActivity<*, *>, val extraNav: NavigationView?, val accountsNav: NavigationView?)
+class MainNavDrawer(val view: BaseActivity<*, *>, private val extraNav: NavigationView?, private val accountsNav: NavigationView?)
     : BaseViewHolder.OnItemClickListener<Login> {
 
-    var menusHolder: ViewGroup? = null
-    val togglePinned: View? = view.findViewById<View>(R.id.togglePinned)
-    val pinnedList: DynamicRecyclerView? = view.findViewById<DynamicRecyclerView>(R.id.pinnedList)
-    val pinnedListAdapter = PinnedReposAdapter(true)
-    val userModel: Login? = Login.getUser()
+    private var menusHolder: ViewGroup? = null
+    private val togglePinned: View? = view.findViewById<View>(R.id.togglePinned)
+    private val pinnedList: DynamicRecyclerView? = view.findViewById<DynamicRecyclerView>(R.id.pinnedList)
+    private val pinnedListAdapter = PinnedReposAdapter(true)
+    private val userModel: Login? = Login.getUser()
 
     init {
         menusHolder = view.findViewById<ViewGroup>(R.id.menusHolder)
diff --git a/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java b/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java
index 2e1b097d..961a9a03 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/editor/EditorActivity.java
@@ -165,9 +165,7 @@ public class EditorActivity extends BaseActivity<EditorMvp.View, EditorPresenter
                 "[" + getString(R.string.app_name) + "](https://play.google.com/store/apps/details?id=com.fastaccess.github)") + "_";
         sentVia.setVisibility(PrefGetter.isSentViaBoxEnabled() ? View.VISIBLE : GONE);
         sentVia.setChecked(PrefGetter.isSentViaEnabled());
-        sentVia.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            PrefHelper.set("sent_via", isChecked);
-        });
+        sentVia.setOnCheckedChangeListener((buttonView, isChecked) -> PrefHelper.set("sent_via", isChecked));
         MarkDownProvider.setMdText(sentVia, sentFromFastHub);
         if (savedInstanceState == null) {
             onCreate();
diff --git a/app/src/main/java/com/fastaccess/ui/modules/login/chooser/LoginChooserActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/login/chooser/LoginChooserActivity.kt
index da839eff..3636e54d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/login/chooser/LoginChooserActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/login/chooser/LoginChooserActivity.kt
@@ -30,12 +30,12 @@ import java.util.*
 
 class LoginChooserActivity : BaseActivity<LoginChooserMvp.View, LoginChooserPresenter>(), LoginChooserMvp.View {
 
-    val language_selector: RelativeLayout by bindView(R.id.language_selector)
-    val recycler: DynamicRecyclerView by bindView(R.id.recycler)
-    val multiAccLayout: View by bindView(R.id.multiAccLayout)
-    val viewGroup: CoordinatorLayout by bindView(R.id.viewGroup)
-    val toggleImage: View by bindView(R.id.toggleImage)
-    val adapter = LoginAdapter()
+    private val language_selector: RelativeLayout by bindView(R.id.language_selector)
+    private val recycler: DynamicRecyclerView by bindView(R.id.recycler)
+    private val multiAccLayout: View by bindView(R.id.multiAccLayout)
+    private val viewGroup: CoordinatorLayout by bindView(R.id.viewGroup)
+    private val toggleImage: View by bindView(R.id.toggleImage)
+    private val adapter = LoginAdapter()
 
     override fun layout(): Int = R.layout.login_chooser_layout
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/donation/DonationActivity.java b/app/src/main/java/com/fastaccess/ui/modules/main/donation/DonationActivity.java
index 149aef43..5d6fe076 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/main/donation/DonationActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/main/donation/DonationActivity.java
@@ -85,7 +85,7 @@ public class DonationActivity extends BaseActivity {
         }
     }
 
-    protected void checkPurchase() {
+    private void checkPurchase() {
         ((BasePresenter) getPresenter()).manageViewDisposable(RxBillingService.getInstance(this, BuildConfig.DEBUG)
                 .getPurchases(ProductType.IN_APP)
                 .subscribe((purchases, throwable) -> {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/premium/PremiumActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/main/premium/PremiumActivity.kt
index d331264b..b2628a0b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/main/premium/PremiumActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/main/premium/PremiumActivity.kt
@@ -26,9 +26,9 @@ import com.fastaccess.ui.widgets.bindView
  */
 class PremiumActivity : BaseActivity<PremiumMvp.View, PremiumPresenter>(), PremiumMvp.View {
 
-    val editText: EditText by bindView(R.id.editText)
-    val progressLayout: View by bindView(R.id.progressLayout)
-    val viewGroup: FrameLayout by bindView(R.id.viewGroup)
+    private val editText: EditText by bindView(R.id.editText)
+    private val progressLayout: View by bindView(R.id.progressLayout)
+    private val viewGroup: FrameLayout by bindView(R.id.viewGroup)
 
     override fun layout(): Int = R.layout.pro_features_layout
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java
index 7550e035..ddfb9270 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java
@@ -26,7 +26,7 @@ import io.reactivex.Observable;
  */
 
 public class AllNotificationsPresenter extends BasePresenter<AllNotificationsMvp.View> implements AllNotificationsMvp.Presenter {
-    private ArrayList<GroupedNotificationModel> notifications = new ArrayList<>();
+    private final ArrayList<GroupedNotificationModel> notifications = new ArrayList<>();
 
     @Override public void onItemClick(int position, View v, GroupedNotificationModel model) {
         if (getView() == null) return;
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/branches/BranchesFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/branches/BranchesFragment.kt
index 5caacfe1..36390821 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/branches/BranchesFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/branches/BranchesFragment.kt
@@ -20,14 +20,14 @@ import com.fastaccess.ui.widgets.recyclerview.scroll.RecyclerViewFastScroller
  * Created by Kosh on 06 Jul 2017, 9:48 PM
  */
 class BranchesFragment : BaseFragment<BranchesMvp.View, BranchesPresenter>(), BranchesMvp.View {
-    val recycler: DynamicRecyclerView  by lazy { view!!.findViewById<DynamicRecyclerView>(R.id.recycler) }
-    val refresh: SwipeRefreshLayout by lazy { view!!.findViewById<SwipeRefreshLayout>(R.id.refresh) }
-    val stateLayout: StateLayout by lazy { view!!.findViewById<StateLayout>(R.id.stateLayout) }
-    val fastScroller: RecyclerViewFastScroller by lazy { view!!.findViewById<RecyclerViewFastScroller>(R.id.fastScroller) }
+    private val recycler: DynamicRecyclerView  by lazy { view!!.findViewById<DynamicRecyclerView>(R.id.recycler) }
+    private val refresh: SwipeRefreshLayout by lazy { view!!.findViewById<SwipeRefreshLayout>(R.id.refresh) }
+    private val stateLayout: StateLayout by lazy { view!!.findViewById<StateLayout>(R.id.stateLayout) }
+    private val fastScroller: RecyclerViewFastScroller by lazy { view!!.findViewById<RecyclerViewFastScroller>(R.id.fastScroller) }
     private var onLoadMore: OnLoadMore<Boolean>? = null
     private var branchCallback: BranchesPagerListener? = null
 
-    val adapter by lazy { BranchesAdapter(presenter.branches, presenter) }
+    private val adapter by lazy { BranchesAdapter(presenter.branches, presenter) }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/branches/pager/BranchesPagerFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/branches/pager/BranchesPagerFragment.kt
index 53044da8..23cbd3e5 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/branches/pager/BranchesPagerFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/branches/pager/BranchesPagerFragment.kt
@@ -21,9 +21,9 @@ import com.fastaccess.ui.modules.repos.extras.branches.BranchesMvp
  * Created by kosh on 15/07/2017.
  */
 class BranchesPagerFragment : BaseDialogFragment<BaseMvp.FAView, BasePresenter<BaseMvp.FAView>>(), BranchesPagerListener {
-    val pager: ViewPager by lazy { view!!.findViewById<ViewPager>(R.id.pager) }
-    val tabs: TabLayout by lazy { view!!.findViewById<TabLayout>(R.id.tabs) }
-    val toolbar: Toolbar by lazy { view!!.findViewById<Toolbar>(R.id.toolbar) }
+    private val pager: ViewPager by lazy { view!!.findViewById<ViewPager>(R.id.pager) }
+    private val tabs: TabLayout by lazy { view!!.findViewById<TabLayout>(R.id.tabs) }
+    private val toolbar: Toolbar by lazy { view!!.findViewById<Toolbar>(R.id.toolbar) }
     private var branchCallback: BranchesMvp.BranchSelectionListener? = null
 
     override fun onAttach(context: Context) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/create/CreateLabelDialogFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/create/CreateLabelDialogFragment.java
index c69bd3dd..c5ea19d6 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/create/CreateLabelDialogFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/create/CreateLabelDialogFragment.java
@@ -79,7 +79,6 @@ public class CreateLabelDialogFragment extends BaseDialogFragment<CreateLabelMvp
         if (login == null || repo == null) {
             return;
         }
-        ;
         recycler.setAdapter(new LabelColorsAdapter(Arrays.asList(getResources().getStringArray(R.array.label_colors)), getPresenter()));
         recycler.addKeyLineDivider();
         toolbar.setTitle(R.string.create_label);
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/license/RepoLicenseBottomSheet.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/license/RepoLicenseBottomSheet.kt
index e07334c9..07f4104b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/license/RepoLicenseBottomSheet.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/license/RepoLicenseBottomSheet.kt
@@ -22,11 +22,11 @@ class RepoLicenseBottomSheet : BaseMvpBottomSheetDialogFragment<RepoLicenseMvp.V
     @State var content: String? = null
 
 
-    val stateLayout: StateLayout by lazy { view!!.findViewById<StateLayout>(R.id.stateLayout) }
+    private val stateLayout: StateLayout by lazy { view!!.findViewById<StateLayout>(R.id.stateLayout) }
 
-    val loader: ProgressBar by lazy { view!!.findViewById<ProgressBar>(R.id.readmeLoader) }
-    val webView: PrettifyWebView by lazy { view!!.findViewById<PrettifyWebView>(R.id.webView) }
-    val licenseName: TextView by lazy { view!!.findViewById<TextView>(R.id.licenseName) }
+    private val loader: ProgressBar by lazy { view!!.findViewById<ProgressBar>(R.id.readmeLoader) }
+    private val webView: PrettifyWebView by lazy { view!!.findViewById<PrettifyWebView>(R.id.webView) }
+    private val licenseName: TextView by lazy { view!!.findViewById<TextView>(R.id.licenseName) }
 
 
     override fun providePresenter(): RepoLicensePresenter = RepoLicensePresenter()
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/license/RepoLicensePresenter.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/license/RepoLicensePresenter.kt
index d7d6ff57..4db1f0ff 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/license/RepoLicensePresenter.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/license/RepoLicensePresenter.kt
@@ -9,7 +9,7 @@ import com.fastaccess.ui.base.mvp.presenter.BasePresenter
 class RepoLicensePresenter : BasePresenter<RepoLicenseMvp.View>(), RepoLicenseMvp.Presenter {
 
     override fun onLoadLicense(login: String, repo: String) {
-        makeRestCall(RestProvider.getRepoService(isEnterprise()).getLicense(login, repo),
+        makeRestCall(RestProvider.getRepoService(isEnterprise).getLicense(login, repo),
                 { license -> sendToView { it.onLicenseLoaded(license) } })
     }
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupPresenter.java
index 906b82da..7aa24dab 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/popup/IssuePopupPresenter.java
@@ -16,7 +16,7 @@ public class IssuePopupPresenter extends BasePresenter<IssuePopupMvp.View> imple
         CommentRequestModel requestModel = new CommentRequestModel();
         requestModel.setBody(text);
         makeRestCall(RestProvider.getIssueService(isEnterprise()).createIssueComment(login, repoId, issueNumber, requestModel),
-                comment -> sendToView(view -> view.onSuccessfullySubmitted()));
+                comment -> sendToView(IssuePopupMvp.View::onSuccessfullySubmitted));
     }
 
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
index 10faabeb..9f12547b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
@@ -30,11 +30,11 @@ import com.prettifier.pretty.PrettifyWebView
  */
 class WikiActivity : BaseActivity<WikiMvp.View, WikiPresenter>(), WikiMvp.View {
 
-    val navMenu: NavigationView by bindView(R.id.wikiSidebar)
-    val drawerLayout: DrawerLayout by bindView(R.id.drawer)
-    val progressbar: ProgressBar by bindView(R.id.progress)
-    val stateLayout: StateLayout by bindView(R.id.stateLayout)
-    val webView: PrettifyWebView by bindView(R.id.webView)
+    private val navMenu: NavigationView by bindView(R.id.wikiSidebar)
+    private val drawerLayout: DrawerLayout by bindView(R.id.drawer)
+    private val progressbar: ProgressBar by bindView(R.id.progress)
+    private val stateLayout: StateLayout by bindView(R.id.stateLayout)
+    private val webView: PrettifyWebView by bindView(R.id.webView)
 
 
     @State var wiki = WikiContentModel(null, null, arrayListOf())
diff --git a/app/src/main/java/com/fastaccess/ui/modules/reviews/AddReviewDialogFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/reviews/AddReviewDialogFragment.kt
index 9ba284dc..7378f377 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/reviews/AddReviewDialogFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/reviews/AddReviewDialogFragment.kt
@@ -25,11 +25,11 @@ import com.fastaccess.ui.widgets.SpannableBuilder
  */
 class AddReviewDialogFragment : BaseDialogFragment<BaseMvp.FAView, BasePresenter<BaseMvp.FAView>>() {
 
-    val toolbar: Toolbar by lazy { view!!.findViewById<Toolbar>(R.id.toolbar) }
-    val textView: TextView by lazy { view!!.findViewById<TextView>(R.id.text) }
-    val lineNo: TextView by lazy { view!!.findViewById<TextView>(R.id.lineNo) }
-    val editText: TextInputLayout by lazy { view!!.findViewById<TextInputLayout>(R.id.editText) }
-    val spacePattern = "\\s+".toRegex()
+    private val toolbar: Toolbar by lazy { view!!.findViewById<Toolbar>(R.id.toolbar) }
+    private val textView: TextView by lazy { view!!.findViewById<TextView>(R.id.text) }
+    private val lineNo: TextView by lazy { view!!.findViewById<TextView>(R.id.lineNo) }
+    private val editText: TextInputLayout by lazy { view!!.findViewById<TextInputLayout>(R.id.editText) }
+    private val spacePattern = "\\s+".toRegex()
 
     private var commentCallback: ReviewCommentListener? = null
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt
index 58a7799c..d672a799 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/reviews/changes/ReviewChangesActivity.kt
@@ -26,8 +26,8 @@ class ReviewChangesActivity : BaseActivity<ReviewChangesMvp.View, ReviewChangesP
 
 
     val toolbar: Toolbar by bindView(R.id.toolbar)
-    val spinner: Spinner by bindView(R.id.reviewMethod)
-    val editText: TextInputLayout by bindView(R.id.editText)
+    private val spinner: Spinner by bindView(R.id.reviewMethod)
+    private val editText: TextInputLayout by bindView(R.id.editText)
 
     @State var reviewRequest: ReviewRequestModel? = null
     @State var repoId: String? = null
diff --git a/app/src/main/java/com/fastaccess/ui/modules/settings/sound/NotificationSoundBottomSheet.kt b/app/src/main/java/com/fastaccess/ui/modules/settings/sound/NotificationSoundBottomSheet.kt
index 8614b2f1..8437e7a4 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/settings/sound/NotificationSoundBottomSheet.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/settings/sound/NotificationSoundBottomSheet.kt
@@ -22,12 +22,12 @@ import com.fastaccess.ui.widgets.FontTextView
 class NotificationSoundBottomSheet : BaseMvpBottomSheetDialogFragment<NotificationSoundMvp.View,
         NotificationSoundPresenter>(), NotificationSoundMvp.View {
 
-    val title: FontTextView by lazy { view!!.findViewById<FontTextView>(R.id.title) }
-    val radioGroup: RadioGroup by lazy { view!!.findViewById<RadioGroup>(R.id.picker) }
-    val okButton: Button by lazy { view!!.findViewById<Button>(R.id.ok) }
-    val padding: Int by lazy { resources.getDimensionPixelSize(R.dimen.spacing_xs_large) }
-    var canPlaySound: Boolean = false
-    val mediaPlayer = MediaPlayer()
+    private val title: FontTextView by lazy { view!!.findViewById<FontTextView>(R.id.title) }
+    private val radioGroup: RadioGroup by lazy { view!!.findViewById<RadioGroup>(R.id.picker) }
+    private val okButton: Button by lazy { view!!.findViewById<Button>(R.id.ok) }
+    private val padding: Int by lazy { resources.getDimensionPixelSize(R.dimen.spacing_xs_large) }
+    private var canPlaySound: Boolean = false
+    private val mediaPlayer = MediaPlayer()
 
     private var listener: NotificationSoundMvp.NotificationSoundListener? = null
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/theme/ThemeActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/theme/ThemeActivity.kt
index 9ddbb8fd..cc3f0d5e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/theme/ThemeActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/theme/ThemeActivity.kt
@@ -25,8 +25,8 @@ import com.fastaccess.ui.widgets.bindView
 
 class ThemeActivity : BaseActivity<BaseMvp.FAView, BasePresenter<BaseMvp.FAView>>(), ThemeFragmentMvp.ThemeListener {
 
-    val pager: ViewPagerView by bindView(R.id.pager)
-    val parentLayout: View by bindView(R.id.parentLayout)
+    private val pager: ViewPagerView by bindView(R.id.pager)
+    private val parentLayout: View by bindView(R.id.parentLayout)
 
     override fun layout(): Int = R.layout.theme_viewpager
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/theme/code/ThemeCodeActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/theme/code/ThemeCodeActivity.kt
index d15a2d91..e87573fd 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/theme/code/ThemeCodeActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/theme/code/ThemeCodeActivity.kt
@@ -21,9 +21,9 @@ import com.prettifier.pretty.helper.CodeThemesHelper
 
 class ThemeCodeActivity : BaseActivity<ThemeCodeMvp.View, ThemeCodePresenter>(), ThemeCodeMvp.View {
 
-    val spinner: Spinner by bindView(R.id.themesList)
-    val webView: PrettifyWebView by bindView(R.id.webView)
-    val progress: ProgressBar? by bindView(R.id.readmeLoader)
+    private val spinner: Spinner by bindView(R.id.themesList)
+    private val webView: PrettifyWebView by bindView(R.id.webView)
+    private val progress: ProgressBar? by bindView(R.id.readmeLoader)
 
     override fun layout(): Int = R.layout.theme_code_layout
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/theme/fragment/ThemeFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/theme/fragment/ThemeFragment.kt
index 89f6e214..7376f02e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/theme/fragment/ThemeFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/theme/fragment/ThemeFragment.kt
@@ -23,8 +23,8 @@ import com.fastaccess.ui.widgets.SpannableBuilder
 
 class ThemeFragment : BaseFragment<ThemeFragmentMvp.View, ThemeFragmentPresenter>(), ThemeFragmentMvp.View {
 
-    val apply: FloatingActionButton by lazy { view!!.findViewById<FloatingActionButton>(R.id.apply) }
-    val toolbar: Toolbar by lazy { view!!.findViewById<Toolbar>(R.id.toolbar) }
+    private val apply: FloatingActionButton by lazy { view!!.findViewById<FloatingActionButton>(R.id.apply) }
+    private val toolbar: Toolbar by lazy { view!!.findViewById<Toolbar>(R.id.toolbar) }
 
     private val THEME = "appTheme"
     private var primaryDarkColor: Int = 0
diff --git a/app/src/main/java/com/fastaccess/ui/modules/trending/TrendingActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/trending/TrendingActivity.kt
index 18d878cf..28fc302d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/trending/TrendingActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/trending/TrendingActivity.kt
@@ -35,13 +35,13 @@ import com.fastaccess.ui.widgets.bindView
 class TrendingActivity : BaseActivity<TrendingMvp.View, TrendingPresenter>(), TrendingMvp.View {
     private var trendingFragment: TrendingFragment? = null
 
-    val navMenu: NavigationView by bindView(R.id.navMenu)
-    val daily: TextView by bindView(R.id.daily)
-    val weekly: TextView by bindView(R.id.weekly)
-    val monthly: TextView by bindView(R.id.monthly)
-    val drawerLayout: DrawerLayout by bindView(R.id.drawer)
-    val clear: View by bindView(R.id.clear)
-    val searchEditText: FontEditText by bindView(R.id.searchEditText)
+    private val navMenu: NavigationView by bindView(R.id.navMenu)
+    private val daily: TextView by bindView(R.id.daily)
+    private val weekly: TextView by bindView(R.id.weekly)
+    private val monthly: TextView by bindView(R.id.monthly)
+    private val drawerLayout: DrawerLayout by bindView(R.id.drawer)
+    private val clear: View by bindView(R.id.clear)
+    private val searchEditText: FontEditText by bindView(R.id.searchEditText)
 
 
     @State var selectedTitle: String = "All Language"
diff --git a/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragment.kt b/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragment.kt
index 723d2d97..681da470 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragment.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragment.kt
@@ -18,11 +18,11 @@ import com.fastaccess.ui.widgets.recyclerview.scroll.RecyclerViewFastScroller
 
 class TrendingFragment : BaseFragment<TrendingFragmentMvp.View, TrendingFragmentPresenter>(), TrendingFragmentMvp.View {
 
-    val recycler: DynamicRecyclerView  by lazy { view!!.findViewById<DynamicRecyclerView>(R.id.recycler) }
-    val refresh: SwipeRefreshLayout by lazy { view!!.findViewById<SwipeRefreshLayout>(R.id.refresh) }
-    val stateLayout: StateLayout by lazy { view!!.findViewById<StateLayout>(R.id.stateLayout) }
-    val fastScroller: RecyclerViewFastScroller by lazy { view!!.findViewById<RecyclerViewFastScroller>(R.id.fastScroller) }
-    val adapter by lazy { TrendingAdapter(presenter.getTendingList()) }
+    private val recycler: DynamicRecyclerView  by lazy { view!!.findViewById<DynamicRecyclerView>(R.id.recycler) }
+    private val refresh: SwipeRefreshLayout by lazy { view!!.findViewById<SwipeRefreshLayout>(R.id.refresh) }
+    private val stateLayout: StateLayout by lazy { view!!.findViewById<StateLayout>(R.id.stateLayout) }
+    private val fastScroller: RecyclerViewFastScroller by lazy { view!!.findViewById<RecyclerViewFastScroller>(R.id.fastScroller) }
+    private val adapter by lazy { TrendingAdapter(presenter.getTendingList()) }
 
     @State var lang: String = ""
     @State var since: String = ""
diff --git a/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragmentPresenter.kt b/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragmentPresenter.kt
index a295f96d..42535735 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragmentPresenter.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/trending/fragment/TrendingFragmentPresenter.kt
@@ -20,7 +20,7 @@ import org.jsoup.select.Elements
 
 class TrendingFragmentPresenter : BasePresenter<TrendingFragmentMvp.View>(), TrendingFragmentMvp.Presenter {
 
-    var disposel: Disposable? = null
+    private var disposel: Disposable? = null
 
     private val trendingList: ArrayList<TrendingModel> = ArrayList()
 
@@ -47,7 +47,7 @@ class TrendingFragmentPresenter : BasePresenter<TrendingFragmentMvp.View>(), Tre
     }
 
 
-    fun getTrendingObservable(response: String): Observable<TrendingModel> {
+    private fun getTrendingObservable(response: String): Observable<TrendingModel> {
         return Observable.fromPublisher { s ->
             val document: Document = Jsoup.parse(response, "")
             val repoList = document.select(".repo-list")
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/AutoLinearLayout.java b/app/src/main/java/com/fastaccess/ui/widgets/AutoLinearLayout.java
index 59f86710..674e07ad 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/AutoLinearLayout.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/AutoLinearLayout.java
@@ -17,8 +17,8 @@ public class AutoLinearLayout extends FrameLayout {
     private int mOrientation;
     private int mGravity = Gravity.TOP | GravityCompat.START;
 
-    public final static int HORIZONTAL = 0;
-    public final static int VERTICAL = 1;
+    private final static int HORIZONTAL = 0;
+    private final static int VERTICAL = 1;
 
     private ArrayList<ViewPosition> mListPositions = new ArrayList<>();
 
@@ -183,7 +183,7 @@ public class AutoLinearLayout extends FrameLayout {
      * @param bottom
      *         parent bottom
      */
-    void layoutVertical(int left, int top, int right, int bottom) {
+    private void layoutVertical(int left, int top, int right, int bottom) {
         final int count = getChildCount();
         if (count == 0)
             return;
@@ -253,7 +253,7 @@ public class AutoLinearLayout extends FrameLayout {
      * @param bottom
      *         parent bottom
      */
-    void layoutHorizontal(int left, int top, int right, int bottom) {
+    private void layoutHorizontal(int left, int top, int right, int bottom) {
         final int count = getChildCount();
         if (count == 0)
             return;
@@ -419,7 +419,7 @@ public class AutoLinearLayout extends FrameLayout {
      * @param gravity
      *         See {@link Gravity}
      */
-    public void setGravity(int gravity) {
+    private void setGravity(int gravity) {
         if (mGravity != gravity) {
             if ((gravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK) == 0) {
                 gravity |= GravityCompat.START;
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/ColorPickerPreference.java b/app/src/main/java/com/fastaccess/ui/widgets/ColorPickerPreference.java
index ba0c01d6..ff1abdf7 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/ColorPickerPreference.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/ColorPickerPreference.java
@@ -25,8 +25,6 @@ import petrov.kristiyan.colorpicker.ColorPicker;
 
 public class ColorPickerPreference extends Preference implements ColorPicker.OnChooseColorListener {
 
-    private ColorPicker colorPicker;
-
     public ColorPickerPreference(Context context) {
         super(context);
         init();
@@ -57,12 +55,12 @@ public class ColorPickerPreference extends Preference implements ColorPicker.OnC
 
         int selected_color = getSelectedColor();
         String title = String.format("Accent Color: (Currently: %s)", getSelectedColorName());
-        colorPicker = new ColorPicker(getContext());
+        ColorPicker colorPicker = new ColorPicker(getContext());
         colorPicker.setRoundColorButton(true);
         colorPicker.setColors(R.array.theme_colors_hex);
         colorPicker.setDefaultColorButton(selected_color);
         colorPicker.setTitle(title);
-        TextView title_tv = (TextView) colorPicker.getDialogViewLayout().findViewById(R.id.title);
+        TextView title_tv = colorPicker.getDialogViewLayout().findViewById(R.id.title);
         title_tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
         colorPicker.getPositiveButton().setTextColor(ViewHelper.getPrimaryTextColor(getContext()));
         colorPicker.getNegativeButton().setTextColor(ViewHelper.getPrimaryTextColor(getContext()));
@@ -108,7 +106,7 @@ public class ColorPickerPreference extends Preference implements ColorPicker.OnC
         // do nothing when the dialog is canceled
     }
 
-    public String getSelectedColorName() {
+    private String getSelectedColorName() {
         String[] colorNames = getContext().getResources().getStringArray(R.array.theme_colors);
         return colorNames[PrefGetter.getThemeColor(getContext()) - 1];
     }
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/LabelSpan.java b/app/src/main/java/com/fastaccess/ui/widgets/LabelSpan.java
index 05be4b26..0e055ad9 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/LabelSpan.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/LabelSpan.java
@@ -45,7 +45,7 @@ public class LabelSpan extends ReplacementSpan {
     private final int color;
     private final SpanDimensions dims;
 
-    public LabelSpan(int color, @NonNull SpanDimensions dims) {
+    private LabelSpan(int color, @NonNull SpanDimensions dims) {
         this.color = color;
         txtPaint.bgColor = color;
         this.dims = dims;
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/contributions/ContributionsDay.java b/app/src/main/java/com/fastaccess/ui/widgets/contributions/ContributionsDay.java
index 07e89b4a..ff6f7052 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/contributions/ContributionsDay.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/contributions/ContributionsDay.java
@@ -13,7 +13,7 @@ public class ContributionsDay {
     // Level is used to record the color of the block
     public int level = Integer.MIN_VALUE;
     // Data is used to calculated the height of the pillar
-    public int data = Integer.MIN_VALUE;
+    private int data = Integer.MIN_VALUE;
 
     public ContributionsDay(int year, int month, int day, int level, int data) {
         this.year = year;
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/contributions/ContributionsProvider.java b/app/src/main/java/com/fastaccess/ui/widgets/contributions/ContributionsProvider.java
index a78964de..ecf9228a 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/contributions/ContributionsProvider.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/contributions/ContributionsProvider.java
@@ -14,9 +14,9 @@ import java.util.List;
  */
 public class ContributionsProvider {
 
-    public final static String FILL_STRING = "fill=\"";
-    public final static String DATA_STRING = "data-count=\"";
-    public final static String DATE_STRING = "data-date=\"";
+    private final static String FILL_STRING = "fill=\"";
+    private final static String DATA_STRING = "data-count=\"";
+    private final static String DATE_STRING = "data-date=\"";
 
     @NonNull public List<ContributionsDay> getContributions(@Nullable String string) {
         ArrayList<ContributionsDay> contributions = new ArrayList<>();
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/contributions/GitHubContributionsView.java b/app/src/main/java/com/fastaccess/ui/widgets/contributions/GitHubContributionsView.java
index 891a1ae2..b53a707f 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/contributions/GitHubContributionsView.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/contributions/GitHubContributionsView.java
@@ -76,7 +76,7 @@ public class GitHubContributionsView extends View {
         blockPaint.setStyle(Paint.Style.FILL);
     }
 
-    protected void initAttributes(TypedArray attributes) {
+    private void initAttributes(TypedArray attributes) {
         baseColor = attributes.getColor(R.styleable.GitHubContributionsView_baseColor, baseColor);
         baseEmptyColor = attributes.getColor(R.styleable.GitHubContributionsView_baseEmptyColor, baseEmptyColor);
         backgroundBaseColor = attributes.getColor(R.styleable.GitHubContributionsView_backgroundBaseColor, backgroundBaseColor);
@@ -236,7 +236,7 @@ public class GitHubContributionsView extends View {
      * @param username
      *         also, can be an organization
      */
-    public void loadUserName(String username) {
+    private void loadUserName(String username) {
         this.username = username;
         clearContribution();
     }
@@ -244,7 +244,7 @@ public class GitHubContributionsView extends View {
     /**
      * Clean de component.
      */
-    public void clearContribution() {
+    private void clearContribution() {
         bitmap = null;
         invalidate();
     }
@@ -371,7 +371,7 @@ public class GitHubContributionsView extends View {
         setLayoutParams(ll);
     }
 
-    public int getHorizontalBlockNumber(int total, int divider) {
+    private int getHorizontalBlockNumber(int total, int divider) {
         boolean isInteger = total % divider == 0;
         int result = total / divider;
         return (isInteger) ? result : result + 1;
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseRecyclerAdapter.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseRecyclerAdapter.java
index 17a494b4..8be444e8 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseRecyclerAdapter.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseRecyclerAdapter.java
@@ -30,15 +30,15 @@ public abstract class BaseRecyclerAdapter<M, VH extends BaseViewHolder,
     private GuideListener guideListener;
     private boolean progressAdded;
 
-    public BaseRecyclerAdapter() {
+    protected BaseRecyclerAdapter() {
         this(new ArrayList<>());
     }
 
-    public BaseRecyclerAdapter(@NonNull List<M> data) {
+    protected BaseRecyclerAdapter(@NonNull List<M> data) {
         this(data, null);
     }
 
-    public BaseRecyclerAdapter(@NonNull List<M> data, @Nullable P listener) {
+    protected BaseRecyclerAdapter(@NonNull List<M> data, @Nullable P listener) {
         this.data = data;
         this.listener = listener;
     }
@@ -93,7 +93,7 @@ public abstract class BaseRecyclerAdapter<M, VH extends BaseViewHolder,
     }
 
     @SuppressWarnings("unchecked")
-    protected void onShowGuide(@NonNull VH holder, int position) {// give the flexibility to other adapters to override this
+    private void onShowGuide(@NonNull VH holder, int position) {// give the flexibility to other adapters to override this
         if (position == 0 && !isShowedGuide() && guideListener != null) {
             guideListener.onShowGuide(holder.itemView, getItem(position));
             showedGuide = true;
@@ -197,7 +197,7 @@ public abstract class BaseRecyclerAdapter<M, VH extends BaseViewHolder,
         this.guideListener = guideListener;
     }
 
-    public boolean isShowedGuide() {
+    private boolean isShowedGuide() {
         return showedGuide;
     }
 
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java
index 70bd2475..6f4b3d9a 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java
@@ -27,7 +27,7 @@ public abstract class BaseViewHolder<T> extends RecyclerView.ViewHolder implemen
         return LayoutInflater.from(parent.getContext()).inflate(layoutRes, parent, false);
     }
 
-    public BaseViewHolder(@NonNull View itemView) {
+    protected BaseViewHolder(@NonNull View itemView) {
         this(itemView, null);
     }
 
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/DynamicRecyclerView.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/DynamicRecyclerView.java
index 2d7d8344..27f3de75 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/DynamicRecyclerView.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/DynamicRecyclerView.java
@@ -76,7 +76,7 @@ public class DynamicRecyclerView extends RecyclerView {
         addItemDecoration(bottomPaddingDecoration);
     }
 
-    public void showEmptyView() {
+    private void showEmptyView() {
         Adapter<?> adapter = getAdapter();
         if (adapter != null) {
             if (emptyView != null) {
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a2f154c5..c7bf0b50 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -54,7 +54,6 @@
     <string name="no_body">Содержимое отсутствует</string>
     <string name="contributors">Вкладчики</string>
     <string name="contributions">Вклады</string>
-    <string name="by"></string>
     <string name="close_issue">Закрыть Вопрос</string>
     <string name="re_open_issue">Открыть Вопрос</string>
     <string name="re_open">Открыть</string>
diff --git a/build.gradle b/build.gradle
index a1c7d465..67ca835a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,13 +14,14 @@ buildscript {
         assertjVersion = '2.5.0'
         espresseVersion = '2.2.2'
         requery = '1.3.2'
-        kotlin_version = '1.1.3-2'
+        kotlin_version = '1.2-M1'
         commonmark = '0.9.0'
     }
 
     repositories {
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
+        maven { url 'http://dl.bintray.com/kotlin/kotlin-eap-1.2' }
         google()
     }
     dependencies {