CON-957: Code styling