recent changes(clean codes)