Update notes for submitted changes

* Move tools code to where it is used