Update doc strings and comments