Minor clean up.