Minor Code Chnges