Improved style and markup
Improved markup
Extended doc