diff --git a/RecyclerViewRefreshDemo/.idea/misc.xml b/RecyclerViewRefreshDemo/.idea/misc.xml
index 5d19981..fbb6828 100644
--- a/RecyclerViewRefreshDemo/.idea/misc.xml
+++ b/RecyclerViewRefreshDemo/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/EndlessRecyclerOnScrollListener.java b/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/EndlessRecyclerOnScrollListener.java
index a3a54d8..ceb8585 100644
--- a/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/EndlessRecyclerOnScrollListener.java
+++ b/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/EndlessRecyclerOnScrollListener.java
@@ -17,15 +17,15 @@ public abstract class EndlessRecyclerOnScrollListener extends RecyclerView.OnScr
     public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
         super.onScrollStateChanged(recyclerView, newState);
         LinearLayoutManager manager = (LinearLayoutManager) recyclerView.getLayoutManager();
-        // 当不滚动时
+        // 当不滑动时
         if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-            //获取最后一个完全显示的ItemPosition
-            int lastVisibleItem = manager.findLastCompletelyVisibleItemPosition();
+            //获取最后一个完全显示的itemPosition
+            int lastItemPosition = manager.findLastCompletelyVisibleItemPosition();
             int itemCount = manager.getItemCount();
 
-            // 判断是否滚动到底部，并且是向上滚动
-            if (lastVisibleItem == (itemCount - 1) && isSlidingUpward) {
-                //加载更多功能的代码
+            // 判断是否滑动到了最后一个item，并且是向上滑动
+            if (lastItemPosition == (itemCount - 1) && isSlidingUpward) {
+                //加载更多
                 onLoadMore();
             }
         }
diff --git a/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/MainActivity.java b/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/MainActivity.java
index e121499..9910b0b 100644
--- a/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/MainActivity.java
+++ b/RecyclerViewRefreshDemo/app/src/main/java/com/yl/recyclerview/MainActivity.java
@@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void init() {
-        toolbar = (Toolbar) findViewById(R.id.tool_bar);
+        toolbar = (Toolbar) findViewById(R.id.toolbar);
         swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_refresh_layout);
         recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
 
diff --git a/RecyclerViewRefreshDemo/app/src/main/res/layout/activity_main.xml b/RecyclerViewRefreshDemo/app/src/main/res/layout/activity_main.xml
index b97cb69..7b1b4e5 100644
--- a/RecyclerViewRefreshDemo/app/src/main/res/layout/activity_main.xml
+++ b/RecyclerViewRefreshDemo/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
-        android:id="@+id/tool_bar"
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/colorPrimaryDark"