Documentation Effort and Minor Cleanup