More cleanup, use Rails 3 style validations, use Ruby 1.9 syntax.