acu163581 Little bit of cleanup as per review