Code Cleanup - Part III