Re-order and cleanup documentation