Refactoring of constructors