Code Cleanup - Part II