Code Cleanup: Final Changes - 2