AI-499 : refactoring