PLAYGROUND-142, refactoring