diff --git a/daemon/cachedump.c b/daemon/cachedump.c
index 165f6c803..045353521 100644
--- a/daemon/cachedump.c
+++ b/daemon/cachedump.c
@@ -99,17 +99,15 @@ dump_rrset_line(SSL* ssl, struct ub_packed_rrset_key* k,
 		return ssl_printf(ssl, "BADRR\n");
 	}
 	s = ldns_rr2str(rr);
+	ldns_rr_free(rr);
 	if(!s) {
-		ldns_rr_free(rr);
 		return ssl_printf(ssl, "BADRR\n");
 	}
 	if(!ssl_printf(ssl, "%s", s)) {
 		free(s);
-		ldns_rr_free(rr);
 		return 0;
 	}
 	free(s);
-	ldns_rr_free(rr);
 	return 1;
 }
 
@@ -635,13 +633,12 @@ load_qinfo(char* str, struct query_info* qinfo, ldns_buffer* buf,
 	qinfo->qclass = ldns_rr_get_class(rr);
 	ldns_buffer_clear(buf);
 	status = ldns_dname2buffer_wire(buf, ldns_rr_owner(rr));
+	ldns_rr_free(rr);
 	if(status != LDNS_STATUS_OK) {
 		(void)ssl_printf(ssl, "error cannot dname2wire: %s\n", 
 			ldns_get_errorstr_by_id(status));
-		ldns_rr_free(rr);
 		return NULL;
 	}
-	ldns_rr_free(rr);
 	ldns_buffer_flip(buf);
 	qinfo->qname_len = ldns_buffer_limit(buf);
 	qinfo->qname = (uint8_t*)regional_alloc_init(region, 
diff --git a/doc/Changelog b/doc/Changelog
index 52ed1ef6f..68e34c707 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- neater comments in worker.h.
 	- removed doc/plan and updated doc/TODO.
 	- silenced EHOSTDOWN (verbosity 2 or higher to see it).
+	- review comments from Jelte, Matthijs. Neater code.
 
 12 November 2008: Wouter
 	- add unbound-control manpage to makedist replace list.
diff --git a/doc/TODO b/doc/TODO
index ad103d59d..527b79c16 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -40,6 +40,7 @@ o cleaner code; return and func statements on newline.
 o memcached module that sits before validator module; checks for memcached
   data (on local lan), stores recursion lookup.  Provides one cache for
   multiple resolver machines, coherent reply content in anycast setup.
+o no openssl_add_all_algorithms, but only the ones necessary, less space.
 
 *** Features features, for later
 * dTLS, TLS, look to need special port numbers, cert storage, recent libssl.