ACTECQ-22 - Code refactoring .