Minor Code Clean Up

Minor Code Clean Up