GPII-153: Code refactoring.
GPII-153: Code refactoring.
Merge branch 'divide-and-conquer' of https://github.com/radmanovi4/prefsEditors into divide-and-conquer