Final Cleanup. Add comments, remove chaff