Some insignificant changes

You might want to borrow some of my changes (but not all). I've created the PR so that you can easily see my changes. No need to merge.