Documentation/Code Cleanup