Improve docmentation