Replace empty? && nil? with blank?