#ANTARCTICLE-181 small refactoring