[arctic-wolf] - Refactor code