Replace let* with let were possible