Complete Code Cleanup