Comment / style tweaks.