Started consolidating docs and doc formatting