cleaned up van.rb