Minor Cleanup