Documentation fix
Cleanup