Small style tweaks, a bit of code cleanup