More code cleanup
LOTs of docs