Minor rewrite of Exit