diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 598d145760fece93f9a3a637757380d0ae294090..108f6d92f38a154e9c3886a6384f4db849c866b9 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -114,7 +114,7 @@ bool sieve_storage_class_exists(struct sieve_instance *svinst,
 }
 
 /*
- * Storage instance
+ * Storage event
  */
 
 static struct event *
@@ -145,6 +145,10 @@ sieve_storage_create_driver_event(struct event *event_parent,
 	return event;
 }
 
+/*
+ * Storage options
+ */
+
 static const char *split_next_arg(const char *const **_args)
 {
 	const char *const *args = *_args;
@@ -281,6 +285,10 @@ sieve_storage_data_parse(struct sieve_storage *storage, const char *data,
 	return 0;
 }
 
+/*
+ * Storage instance
+ */
+
 int sieve_storage_alloc(struct sieve_instance *svinst, struct event *event,
 			const struct sieve_storage *storage_class,
 			const char *data, enum sieve_storage_flags flags,
@@ -641,6 +649,10 @@ void sieve_storage_unref(struct sieve_storage **_storage)
 	pool_unref(&storage->pool);
 }
 
+/*
+ * Binary
+ */
+
 int sieve_storage_setup_bin_path(struct sieve_storage *storage, mode_t mode)
 {
 	const char *bin_path = storage->bin_path;
@@ -695,6 +707,10 @@ int sieve_storage_setup_bin_path(struct sieve_storage *storage, mode_t mode)
 	return -1;
 }
 
+/*
+ * Properties
+ */
+
 int sieve_storage_is_singular(struct sieve_storage *storage)
 {
 	if (storage->v.is_singular == NULL)