Further stylistic cleanup as per review