WIP on code doc cleanup