Better doc comments