Yet another bunch of minor cleanups
Rephrased as per PR comments
Fixed as per PR comments
Merge pull request #190 from scara/v10_Yet_another_minor_cleanup

Yet another bunch of minor cleanups