Issue #318 : minor style updates per review from Reynold Xin