Minor clean up check-in