removing return from signal handlers, removing print statements