Minor Clean-up