Started Code Cleanup