fix intend, remove same codes