Minor cleanup,