Code Cleanup
Fixes