Change Detection: perf, fix, style