Removing extra blank lines
Cleanup...
Add hotkeys support