Removed Stop!, added :on-close -> :exit

Refactored functions to letfn block.