code improvement_Organized