Re-order and simplify docs