Minor refactor on the Model __init__