Some code style tweaks.