Reorganize signal init logic