Minor code style tweaks