Small refactor to quit module