code refractoring
Minor chnages
fixed merge conflicts
Added file deletion code