Code Cleanup, File Cleanup