Code Cleanup MC2