diff --git a/repository/TiddlyWiki/TiddlyWiki.class.st b/repository/TiddlyWiki/TiddlyWiki.class.st
index 6d50529..cdadec1 100644
--- a/repository/TiddlyWiki/TiddlyWiki.class.st
+++ b/repository/TiddlyWiki/TiddlyWiki.class.st
@@ -67,20 +67,16 @@ TiddlyWiki >> local: aFileRefence [
 
 { #category : 'accessing' }
 TiddlyWiki >> name [
-
-	^ name ifNil: [
-		self file 
-			ifNil: [ | tempName suffix  | 
-				tempName := self remote file.
-				(tempName endsWithAnyOf: #('.html' '.htm')) 
-					ifTrue: [
-						suffix := (tempName splitOn: '.') last.
-						tempName := tempName removeSuffix: '.', suffix.
-				].
-				name := tempName
-			] 
-			ifNotNil: [ name := self file basenameWithoutExtension ] 
-	]
+	| tempName suffix  |
+	name ifNotNil: [ ^ name ].
+	self file ifNotNil: [ ^ name := self file basenameWithoutExtension ].
+	self remote ifNil: [ ^ name := nil ].
+	tempName := self remote file.
+	(tempName endsWithAnyOf: #('.html' '.htm')) ifTrue: [
+			suffix := (tempName splitOn: '.') last.
+			tempName := tempName removeSuffix: '.', suffix.
+	].
+	name := tempName
 ]
 
 { #category : 'accessing' }