Various code style tweaks