diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
index 2fe0444a6e..25713463ec 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
@@ -20,6 +20,7 @@ import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.wikivoyage.data.WikivoyageJsonParser;
+import net.osmand.plus.wikivoyage.data.WikivoyageJsonParser.WikivoyageContentItem;
 
 
 public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFragment {
@@ -45,15 +46,15 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 			return;
 		}
 
-		final WikivoyageJsonParser.WikivoyageContentItem wikivoyageContentItem = WikivoyageJsonParser.parseJsonContents(contentsJson);
-		if (wikivoyageContentItem == null) {
+		final WikivoyageContentItem contentItem = WikivoyageJsonParser.parseJsonContents(contentsJson);
+		if (contentItem == null) {
 			return;
 		}
 
 		items.add(new TitleItem(getString(R.string.shared_string_contents)));
 
 		expListView = new ExpandableListView(getContext());
-		ExpandableListAdapter listAdapter = new ExpandableListAdapter(getContext(), wikivoyageContentItem);
+		ExpandableListAdapter listAdapter = new ExpandableListAdapter(getContext(), contentItem);
 
 		expListView.setAdapter(listAdapter);
 		Drawable transparent = ContextCompat.getDrawable(getContext(), R.color.color_transparent);
@@ -69,7 +70,7 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 			@Override
 			public boolean onChildClick(ExpandableListView parent, View v,
 			                            int groupPosition, int childPosition, long id) {
-				String link = wikivoyageContentItem.getSubItems().get(groupPosition).getSubItems().get(childPosition).getLink();
+				String link = contentItem.getSubItems().get(groupPosition).getSubItems().get(childPosition).getLink();
 				sendResult(link);
 				dismiss();
 				return false;
@@ -78,7 +79,7 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 		expListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
 			@Override
 			public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
-				String link = wikivoyageContentItem.getSubItems().get(groupPosition).getLink();
+				String link = contentItem.getSubItems().get(groupPosition).getLink();
 				sendResult(link);
 				dismiss();
 				return false;
@@ -118,14 +119,14 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 
 		private Context context;
 
-		private WikivoyageJsonParser.WikivoyageContentItem wikivoyageContentItem;
+		private WikivoyageContentItem contentItem;
 
 		private Drawable itemGroupIcon;
 		private Drawable itemChildIcon;
 
-		ExpandableListAdapter(Context context, WikivoyageJsonParser.WikivoyageContentItem wikivoyageContentItem) {
+		ExpandableListAdapter(Context context, WikivoyageContentItem contentItem) {
 			this.context = context;
-			this.wikivoyageContentItem = wikivoyageContentItem;
+			this.contentItem = contentItem;
 
 			itemGroupIcon = getIcon(R.drawable.ic_action_list_header, nightMode
 					? R.color.wikivoyage_contents_parent_icon_dark : R.color.wikivoyage_contents_parent_icon_light);
@@ -136,7 +137,7 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 
 		@Override
 		public Object getChild(int groupPosition, int childPosititon) {
-			return wikivoyageContentItem.getSubItems().get(groupPosition).getSubItems().get(childPosititon).getName();
+			return contentItem.getSubItems().get(groupPosition).getSubItems().get(childPosititon).getName();
 		}
 
 		@Override
@@ -161,7 +162,7 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 
 			convertView.findViewById(R.id.upper_row_divider).setVisibility(View.GONE);
 			txtListChild.setTypeface(null);
-			if (childPosition == wikivoyageContentItem.getSubItems().get(groupPosition).getSubItems().size() - 1) {
+			if (childPosition == contentItem.getSubItems().get(groupPosition).getSubItems().size() - 1) {
 				convertView.findViewById(R.id.bottom_row_divider).setVisibility(View.VISIBLE);
 			} else {
 				convertView.findViewById(R.id.bottom_row_divider).setVisibility(View.GONE);
@@ -172,18 +173,18 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 
 		@Override
 		public int getChildrenCount(int groupPosition) {
-			return wikivoyageContentItem.getSubItems().get(groupPosition).getSubItems().size();
+			return contentItem.getSubItems().get(groupPosition).getSubItems().size();
 		}
 
 		@Override
 		public Object getGroup(int groupPosition) {
-			return wikivoyageContentItem.getSubItems().get(groupPosition).getName();
+			return contentItem.getSubItems().get(groupPosition).getName();
 
 		}
 
 		@Override
 		public int getGroupCount() {
-			return wikivoyageContentItem.getSubItems().size();
+			return contentItem.getSubItems().size();
 		}
 
 		@Override
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/data/WikivoyageJsonParser.java b/OsmAnd/src/net/osmand/plus/wikivoyage/data/WikivoyageJsonParser.java
index cb791f9913..533cb511dc 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/data/WikivoyageJsonParser.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/data/WikivoyageJsonParser.java
@@ -29,34 +29,33 @@ public class WikivoyageJsonParser {
 			return null;
 		}
 
-		WikivoyageContentItem topWikivoyageContentItem = new WikivoyageContentItem(HEADERS, null);
+		WikivoyageContentItem topContentItem = new WikivoyageContentItem(HEADERS, null);
 		for (int i = 0; i < jArray.length(); i++) {
 			try {
-				String link = "";
-				JSONObject jsonHeader = jArray.getJSONObject(jArray.names().getString(i));
-				link = jsonHeader.getString(LINK);
-				WikivoyageContentItem contentHeaderItem = new WikivoyageContentItem(jArray.names().getString(i), link, topWikivoyageContentItem);
-				topWikivoyageContentItem.subItems.add(contentHeaderItem);
+				JSONObject header = jArray.getJSONObject(jArray.names().getString(i));
+				String link = header.getString(LINK);
+				WikivoyageContentItem headerItem = new WikivoyageContentItem(jArray.names().getString(i), link, topContentItem);
+				topContentItem.subItems.add(headerItem);
 
-				JSONArray jsonSubheaders = jsonHeader.getJSONArray(SUBHEADERS);
+				JSONArray subheaders = header.getJSONArray(SUBHEADERS);
 				List<String> subheaderNames = null;
-				for (int j = 0; j < jsonSubheaders.length(); j++) {
-					JSONObject jsonSubheader = jsonSubheaders.getJSONObject(j);
-					JSONObject jsonSubheaderLink = jsonSubheader.getJSONObject(jsonSubheader.keys().next());
+				for (int j = 0; j < subheaders.length(); j++) {
+					JSONObject subheader = subheaders.getJSONObject(j);
+					JSONObject subheaderLink = subheader.getJSONObject(subheader.keys().next());
 					if (subheaderNames == null) {
 						subheaderNames = new ArrayList<>();
 					}
-					subheaderNames.add(jsonSubheader.keys().next());
-					link = jsonSubheaderLink.getString(LINK);
+					subheaderNames.add(subheader.keys().next());
+					link = subheaderLink.getString(LINK);
 
-					WikivoyageContentItem contentsSubHeaderContainer = new WikivoyageContentItem(jsonSubheader.names().getString(0), link, contentHeaderItem);
-					contentHeaderItem.subItems.add(contentsSubHeaderContainer);
+					WikivoyageContentItem subheaderItem = new WikivoyageContentItem(subheader.names().getString(0), link, headerItem);
+					headerItem.subItems.add(subheaderItem);
 				}
 			} catch (JSONException e) {
 				e.printStackTrace();
 			}
 		}
-		return topWikivoyageContentItem;
+		return topContentItem;
 	}
 
 	public static class WikivoyageContentItem {