More Minor Clean-up