improving readability
moving percentage calcutation to model