small refactor in model to make it more sensible