Some cleanup / thanks notes

These code changes are not necessary but makes the code
slightly nicer.