[minor] Code polish and style tweaks.