* Code style tweaks