Tidies up model.php