Cleaned and added status exiting