Update doc & formatting