Added keyboard shortcut; Code cleanup

Removed console spew.