ITPRO-86 Refactoring and encapsulation, better wording