Refactored Quitting