Some Code Clean Up