diff --git a/miniuri/miniuri.py b/miniuri/miniuri.py
index dc6b47e..5e01953 100644
--- a/miniuri/miniuri.py
+++ b/miniuri/miniuri.py
@@ -38,18 +38,16 @@ class Uri( object ):
         if '://' in uri: # attempt to parse scheme
             self.scheme, uri = uri.split( '://' )
 
+        if '#' in uri:
+            uri, self.fragment = uri.split('#')
+
+        if '?' in uri:
+            uri, self.query = uri.split('?')
+
         # invoke authority setter
         self.authority = uri.split( '/' )[0]
 
-        uri = uri[ len( self.authority ): ] 
-
-        if '#' in uri: # set fragment
-            uri, self.fragment = uri.split( '#' )  
-        
-        if '?' in uri: 
-            self.path, self.query = uri.split( '?' )
-        else:
-            self.path = uri
+        self.path = uri[ len( self.authority ): ]
         
     @property
     def authority( self ):