code formatiing & some other changes