Renamed and added exit functionality
Renamed and added exit functionality