Small clean up improvement