GEOS-5548 - refactoring