Update doc comments, private method names