Refactoring + update only when the model gets better