Minor Code Clean-up