Minor clean up work