Wide refactoring was made!