Remove private declaration for testing.

Signed-off-by: selmeci <selmeci.roman@gmail.com>
Refactored Logic Centralization

Signed-off-by: selmeci <selmeci.roman@gmail.com>