Remove debug msg and clean a little bit
Add quit under q key