Code Cleanup & File Cleanup