CON-68: Code refactor