CON-751: Code refactor