indent and fix state change notification