CON-290: More readable code