Code Cleanup v2