if-instance, reorganize