rework as suggested by steved

@steved555 @pswadi-zendesk 

### Risks
 - None