Using atexit decorator now