More cleanup; some reorganization, etc.