Improve doc blocks