refactoring https://softinstigate.atlassian.net/browse/RH-200
refactoring
https://softinstigate.atlassian.net/browse/RH-200

SoftInstigate/restheart,SoftInstigate/restheart,SoftInstigate/restheart,SoftInstigate/restheart