cleanup commits

While writing the other PR I noticed this little things that needed some cleaning up.

Let me know if this janitorial work is appreciated, I enjoy it and instinctively do it while writing bigger changes.

Cheers! :)