More code style tweaks.