Tidied up web.rb