Some doc tidying
Refactor docs