Cleanup squall.rb