jiraId:MAR-456 refactor