[3119] Minor cosmetic cleanups as per review