code reorder + SIGINT handler function argument fix