Code refactoring. Using directives removed.