--- a/lib/IMPL/Config/ServiceDescriptor.pm	Sat Feb 25 22:35:26 2017 +0300
+++ b/lib/IMPL/Config/ServiceDescriptor.pm	Sun Jul 16 22:59:39 2017 +0300
@@ -4,103 +4,101 @@
 use IMPL::lang qw(:base);
 use IMPL::Exception();
 use IMPL::declare {
-	require => {
-		Bag                 => 'IMPL::Config::Bag',
-		ActivationException => 'IMPL::Config::ActivationException'
-	},
-	base => [
-		'IMPL::Object'             => undef,
-		'IMPL::Config::Descriptor' => undef
-	],
-	props => [
-		type       => 'r',
-		activation => 'r',
-		args       => 'r',
-		services   => 'r',
-		norequire  => 'r',
-		owner      => 'r',
-		_name      => 'rw',
-		_loaded    => 'rw'
-	]
+    require => {
+        Bag                 => 'IMPL::Config::Bag',
+        ActivationException => 'IMPL::Config::ActivationException'
+    },
+    base => [
+        'IMPL::Object'             => undef,
+        'IMPL::Config::Descriptor' => undef
+    ],
+    props => [
+        type       => 'r',
+        activation => 'r',
+        args       => 'r',
+        services   => 'r',
+        norequire  => 'r',
+        owner      => 'r',
+        _name      => 'rw',
+        _loaded    => 'rw'
+    ]
 };
 
 sub CTOR {
-	my ( $this, %opts ) = @_;
+    my ( $this, %opts ) = @_;
 
-	$this->type( $opts{type} )
-	  or die IMPL::InvalidArgumentException->new('type');
-	$this->owner( $opts{owner} )
-	  or die IMPL::InvalidArgumentException->new('owner');
+    $this->type( $opts{type} )
+      or die IMPL::InvalidArgumentException->new('type');
+    $this->owner( $opts{owner} )
+      or die IMPL::InvalidArgumentException->new('owner');
 
-	$this->activation( SELF->ParseActivation( $opts{activation} ) );
-	$this->args( $opts{args} )           if exists $opts{args};
-	$this->services( $opts{services} )   if exists $opts{services};
-	$this->norequire( $opts{norequire} ) if exists $opts{norequire};
+    $this->activation( SELF->ParseActivation( $opts{activation} ) );
+    $this->args( $opts{args} )           if exists $opts{args};
+    $this->services( $opts{services} )   if exists $opts{services};
+    $this->norequire( $opts{norequire} ) if exists $opts{norequire};
 
-	$this->_name( 'new {'
-		  . SELF->ActivationToString( $this->activation )
-		  . '} '
-		  . $this->type );
+    $this->_name( 'new {'
+          . SELF->ActivationToString( $this->activation ) . '} '
+          . $this->type );
 }
 
 sub Activate {
-	my ( $this, $context ) = @_;
+    my ( $this, $context ) = @_;
 
-	my $instance;
-	$context->EnterScope( $this->_name, $this->services );
+    my $instance;
+    $context->EnterScope( $this->_name, $this->services );
 
-	my $activation = $this->activation;
-	my $cache;
+    my $activation = $this->activation;
+    my $cache;
 
-	if ( $activation == SELF->ACTIVATE_SINGLETON ) {
-		$cache = $context->container->root->instances;
-	}
-	elsif ( $activation == SELF->ACTIVATE_CONTAINER ) {
-		$cache = $this->owner->instances;
-	}
-	elsif ( $activation == SELF->ACTIVATE_HIERARCHY ) {
-		$cache = $context->container->instances;
-	}
-	elsif ( $activation == SELF->ACTIVATE_CONTEXT ) {
-		$cache = $context->instances;
-	}
+    if ( $activation == SELF->ACTIVATE_SINGLETON ) {
+        $cache = $context->container->root->instances;
+    }
+    elsif ( $activation == SELF->ACTIVATE_CONTAINER ) {
+        $cache = $this->owner->instances;
+    }
+    elsif ( $activation == SELF->ACTIVATE_HIERARCHY ) {
+        $cache = $context->container->instances;
+    }
+    elsif ( $activation == SELF->ACTIVATE_CONTEXT ) {
+        $cache = $context->instances;
+    }
 
-	$instance = $cache->{ ref($this) } if $cache;
-	unless ($instance) {
-		$instance = $this->CreateInstance($context);
-	}
+    $instance = $cache->{ ref($this) } if $cache;
+    unless ($instance) {
+        $instance = $this->CreateInstance($context);
+        $cache->{ ref($this) } = $instance if $cache;
+    }
 
-	$cache->{ ref($this) } = $instance if $cache;
+    $context->LeaveScope();
 
-	$context->LeaveScope();
-
-	return $instance;
+    return $instance;
 }
 
 sub CreateInstance {
-	my ( $this, $context ) = @_;
+    my ( $this, $context ) = @_;
 
-	my $class =
-	    $this->norequire
-	  ? $this->type
-	  : $context->container->Require( $this->type );
+    my $class =
+        $this->norequire
+      ? $this->type
+      : $context->container->Require( $this->type );
 
-	my $args = $this->args ? $this->args->Activate($context) : undef;
+    my $args = $this->args ? $this->args->Activate($context) : undef;
 
-	if ( defined $args ) {
-		if ( isarray($args) ) {
-			return $class->new(@$args);
-		}
-		elsif ( ishash($args) ) {
-			return $class->new(%$args);
-		}
-		else {
-			return $class->new($args);
-		}
-	}
-	else {
-		return $class->new();
-	}
+    if ( defined $args ) {
+        if ( isarray($args) ) {
+            return $class->new(@$args);
+        }
+        elsif ( ishash($args) ) {
+            return $class->new(%$args);
+        }
+        else {
+            return $class->new($args);
+        }
+    }
+    else {
+        return $class->new();
+    }
 }
 
 1;