Minor clean up as suggested in commnents.