Merge "code style tweaks"