refact(if): tidy up if and remove non-useful event.