OPAL-1992: Refactored methods too long