Code style tweaks