Code style fixes for recent PR