Some improvement code