Replace nil? + empty? check with blank?