Improve on documentation