Improve doc comments