Refactoring of the prototype