review model, clean code