Minor Cleanup in code