--- a/core/MetacelloVersion.st	Mon Sep 17 21:41:57 2012 +0000
+++ b/core/MetacelloVersion.st	Tue Sep 18 13:10:10 2012 +0000
@@ -11,9 +11,10 @@
 !MetacelloVersion class methodsFor:'instance creation'!
 
 fromSpec: aMetacelloVersionSpec
-    ^ (self new versionNumber: aMetacelloVersionSpec versionNumber)
-        spec: aMetacelloVersionSpec;
-        yourself
+
+	^(self fromString: aMetacelloVersionSpec versionString) 
+		spec: aMetacelloVersionSpec;
+		yourself
 !
 
 fromString: aString
@@ -23,10 +24,6 @@
 
 !MetacelloVersion methodsFor:'accessing'!
 
-basicSpec
-    ^ self spec
-!
-
 importedVersions
 
 	importedVersions == nil ifTrue: [ importedVersions := #() ].
@@ -39,7 +36,8 @@
 !
 
 projectLabel
-    ^ self basicSpec projectLabel
+
+	^self spec projectLabel
 !
 
 spec
@@ -118,20 +116,20 @@
 !MetacelloVersion methodsFor:'printing'!
 
 printOn: aStream
-    | label vs |
-    self blessing ~~ #'broken'
-        ifTrue: [ 
-            (vs := self versionStatus) == #'somethingLoaded'
-                ifTrue: [ aStream nextPutAll: '<>' ].
-            vs == #'loadedMatchConstraints'
-                ifTrue: [ aStream nextPutAll: '>=' ].
-            vs == #'loadedToSpec'
-                ifTrue: [ aStream nextPut: $~ ] ].
-    self versionNumber printOn: aStream.
-    self basicSpec ~~ nil
-        ifTrue: [ 
-            (label := self projectLabel) isEmpty
-                ifFalse: [ aStream nextPutAll: ' [' , label , ']' ] ]
+	| label vs |
+	self blessing ~~ #broken
+		ifTrue: [ 
+			(vs := self versionStatus) == #somethingLoaded
+				ifTrue: [ aStream nextPutAll: '<>' ].
+			vs == #loadedMatchConstraints
+				ifTrue: [ aStream nextPutAll: '>=' ].
+			vs == #loadedToSpec
+				ifTrue: [ aStream nextPut: $~ ] ].
+	self versionNumber printOn: aStream.
+	self spec ~~ nil
+		ifTrue: [ 
+			(label := self spec projectLabel) isEmpty
+				ifFalse: [ aStream nextPutAll: ' [' , label , ']' ] ]
 ! !
 
 !MetacelloVersion methodsFor:'private'!
@@ -156,11 +154,13 @@
 !
 
 blessing
-    ^ self basicSpec blessing value
+
+	^self spec blessing value
 !
 
 description
-    ^ self basicSpec description value
+
+	^self spec description value
 !
 
 loader
@@ -169,25 +169,24 @@
 !
 
 project
-    ^ self basicSpec project
+
+	^self spec project
 !
 
 timestamp
-    ^ self basicSpec timestamp value
+
+	^self spec timestamp value
 !
 
 versionKey
-    "version printString, without the versionStatus decorations, suitable for using as a unique key for the 
+	"version printString, without the versionStatus decorations, suitable for using as a unique key for the 
 	 receiver in a dictionary"
 
-    ^ String
-        streamContents: [ :aStream | 
-            | label |
-            self versionNumber printOn: aStream.
-            self basicSpec ~~ nil
-                ifTrue: [ 
-                    (label := self projectLabel) isEmpty
-                        ifFalse: [ aStream nextPutAll: ' [' , label , ']' ] ] ]
+	^ String streamContents: [:aStream| |label|
+		self versionNumber printOn: aStream.
+		self spec ~~ nil
+			ifTrue: [(label := self spec projectLabel) isEmpty
+					ifFalse: [aStream nextPutAll: ' [' , label , ']']] ]
 !
 
 versionNumber
@@ -195,13 +194,9 @@
 	^versionNumber
 !
 
-versionNumberFrom: aString
-    ^ self versionNumber class fromString: aString
-!
-
 versionString
 
-	^self versionNumber versionString
+	^self versionNumber versionString 
 ! !
 
 !MetacelloVersion methodsFor:'testing'!