Fixin extra spaces