diff --git a/app/validators/domain_name_validator.rb b/app/validators/domain_name_validator.rb
index 427a330f3..be8cbb65f 100644
--- a/app/validators/domain_name_validator.rb
+++ b/app/validators/domain_name_validator.rb
@@ -18,7 +18,6 @@ class DomainNameValidator < ActiveModel::EachValidator
       return true if origins.include?(value)
 
       general_domains = /(#{origins.join('|')})/
-      # general_domains = /(.pri.ee|.com.ee|.fie.ee|.med.ee|.ee)/
 
       # it's punycode
       if value[2] == '-' && value[3] == '-'
@@ -39,7 +38,7 @@ class DomainNameValidator < ActiveModel::EachValidator
     def validate_blocked(value)
       return true unless value
       return false if BlockedDomain.where(name: value).count > 0
-      ZonefileSetting.where(origin: value).count == 0
+      ZonefileSetting.where(origin: value).count.zero?
     end
   end
 end