#ANTARCTICLE-181 refactored code - more clear naming for variables and methods