cleaned up user.rb