GPII-941: Micro refactoring. More needed