diff --git a/rdmo/core/serializers.py b/rdmo/core/serializers.py
index 1c06cc8a50..06aeccdee1 100644
--- a/rdmo/core/serializers.py
+++ b/rdmo/core/serializers.py
@@ -38,7 +38,7 @@ def to_representation(self, instance):
         response = super().to_representation(instance)
 
         for markdown_field in self.markdown_fields:
-            if markdown_field in response and response[markdown_field]:
+            if response.get(markdown_field):
                 response[markdown_field] = markdown2html(response[markdown_field])
 
         return response
diff --git a/rdmo/domain/renderers/mixins.py b/rdmo/domain/renderers/mixins.py
index cc0589cf52..ab7c6bfdbe 100644
--- a/rdmo/domain/renderers/mixins.py
+++ b/rdmo/domain/renderers/mixins.py
@@ -12,6 +12,6 @@ def render_attribute(self, xml, attribute):
             self.render_text_element(xml, 'parent', {'dc:uri': attribute['parent']}, None)
             xml.endElement('attribute')
 
-        if 'children' in attribute and attribute['children']:
+        if attribute.get('children'):
             for child in attribute['children']:
                 self.render_attribute(xml, child)
diff --git a/rdmo/projects/forms.py b/rdmo/projects/forms.py
index c1ff1145a1..45cc10f8dc 100644
--- a/rdmo/projects/forms.py
+++ b/rdmo/projects/forms.py
@@ -21,9 +21,8 @@ class CatalogChoiceField(forms.ModelChoiceField):
 
     def label_from_instance(self, obj):
         if obj.available is False:
-            return mark_safe('<div class="text-muted">{}{}</br>{}</div>'.format(
-                obj.title, self._unavailable_icon, markdown2html(obj.help)
-            ))
+            return mark_safe(
+                f'<div class="text-muted">{obj.title}{self._unavailable_icon}</br>{markdown2html(obj.help)}</div>')
 
         return mark_safe(f'<b>{obj.title}</b></br>{markdown2html(obj.help)}')
 
diff --git a/rdmo/projects/renderers.py b/rdmo/projects/renderers.py
index 7833ff09ae..2a3e543418 100644
--- a/rdmo/projects/renderers.py
+++ b/rdmo/projects/renderers.py
@@ -13,25 +13,25 @@ def render_document(self, xml, project):
         self.render_text_element(xml, 'description', {}, project['description'])
         self.render_text_element(xml, 'catalog', {'dc:uri': project['catalog']}, None)
 
-        if 'tasks' in project and project['tasks']:
+        if project.get('tasks'):
             xml.startElement('tasks', {})
             for task in project['tasks']:
                 self.render_text_element(xml, 'task', {'dc:uri': task}, None)
             xml.endElement('tasks')
 
-        if 'views' in project and project['views']:
+        if project.get('views'):
             xml.startElement('views', {})
             for view in project['views']:
                 self.render_text_element(xml, 'view', {'dc:uri': view}, None)
             xml.endElement('views')
 
-        if 'snapshots' in project and project['snapshots']:
+        if project.get('snapshots'):
             xml.startElement('snapshots', {})
             for snapshot in project['snapshots']:
                 self.render_snapshot(xml, snapshot)
             xml.endElement('snapshots')
 
-        if 'values' in project and project['values']:
+        if project.get('values'):
             xml.startElement('values', {})
             for value in project['values']:
                 self.render_value(xml, value)
@@ -46,7 +46,7 @@ def render_snapshot(self, xml, snapshot):
         self.render_text_element(xml, 'title', {}, snapshot['title'])
         self.render_text_element(xml, 'description', {}, snapshot['description'])
 
-        if 'values' in snapshot and snapshot['values']:
+        if snapshot.get('values'):
             xml.startElement('values', {})
             for value in snapshot['values']:
                 self.render_value(xml, value)
diff --git a/rdmo/tasks/renderers/mixins.py b/rdmo/tasks/renderers/mixins.py
index adb6d1cc9c..b89c3deeec 100644
--- a/rdmo/tasks/renderers/mixins.py
+++ b/rdmo/tasks/renderers/mixins.py
@@ -23,13 +23,13 @@ def render_task(self, xml, task):
             self.render_text_element(xml, 'days_after', {}, task['days_after'])
 
             xml.startElement('conditions', {})
-            if 'conditions' in task and task['conditions']:
+            if task.get('conditions'):
                 for condition in task['conditions']:
                     self.render_text_element(xml, 'condition', {'dc:uri': condition['uri']}, None)
             xml.endElement('conditions')
 
             xml.startElement('catalogs', {})
-            if 'catalogs' in task and task['catalogs']:
+            if task.get('catalogs'):
                 for catalog in task['catalogs']:
                     self.render_text_element(xml, 'catalog', {'dc:uri': catalog}, None)
             xml.endElement('catalogs')
diff --git a/rdmo/views/renderers/mixins.py b/rdmo/views/renderers/mixins.py
index f6ee263d70..c5824488c0 100644
--- a/rdmo/views/renderers/mixins.py
+++ b/rdmo/views/renderers/mixins.py
@@ -18,7 +18,7 @@ def render_view(self, xml, view):
                 self.render_text_element(xml, 'help', {'lang': lang_code}, view['help_%s' % lang_code])
 
             xml.startElement('catalogs', {})
-            if 'catalogs' in view and view['catalogs']:
+            if view.get('catalogs'):
                 for catalog in view['catalogs']:
                     self.render_text_element(xml, 'catalog', {'dc:uri': catalog}, None)
             xml.endElement('catalogs')