OPAL-1992: Refactored methods too long
Merge pull request #285 from emorency/master

OPAL-1992: Refactored methods too long