[arctic] - Refactor code.