Update notes for submitted changes

* Calculator: Some cleanup