Refactoring  after code analysing.