Very Minor Cleanup