Polishing code
  - 100% coverage
  - Remove unused 'using'