Some small style tweaks in the code and docs