Minor Code modifications