Remove checking for escpae for Quitting
Remove commented code, add more new commets
Use method reset instead of ~shared_ptr