WC-476 #comment
Refactor