Add const where possible
add cleanup section to todo