style(change detection): some cleanup